aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Renamed win_save_newline -> win_newline

Browse Source
This commit is contained in:
James Booth 2015-03-14 14:16:50 +00:00
parent b84bddc46b
commit 6fd5b617ef
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ui/console.c
View File

@ -315,7 +315,7 @@ cons_show_caps(const char * const fulljid, resource_presence_t presence)
if (caps->category != NULL) { if (caps->category != NULL) {
win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(console); win_newline(console);
} }
if (caps->software != NULL) { if (caps->software != NULL) {
win_vprint(console, '-', NULL, NO_EOL, 0, "", "Software: %s", caps->software); win_vprint(console, '-', NULL, NO_EOL, 0, "", "Software: %s", caps->software);
@ -324,7 +324,7 @@ cons_show_caps(const char * const fulljid, resource_presence_t presence)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version);
} }
if ((caps->software != NULL) || (caps->software_version != NULL)) { if ((caps->software != NULL) || (caps->software_version != NULL)) {
win_save_newline(console); win_newline(console);
} }
if (caps->os != NULL) { if (caps->os != NULL) {
win_vprint(console, '-', NULL, NO_EOL, 0, "", "OS: %s", caps->os); win_vprint(console, '-', NULL, NO_EOL, 0, "", "OS: %s", caps->os);
@ -333,7 +333,7 @@ cons_show_caps(const char * const fulljid, resource_presence_t presence)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version);
} }
if ((caps->os != NULL) || (caps->os_version != NULL)) { if ((caps->os != NULL) || (caps->os_version != NULL)) {
win_save_newline(console); win_newline(console);
} }
if (caps->features != NULL) { if (caps->features != NULL) {
@ -430,7 +430,7 @@ cons_show_room_list(GSList *rooms, const char * const conference_node)
if (room->name != NULL) { if (room->name != NULL) {
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", (%s)", room->name); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", (%s)", room->name);
} }
win_save_newline(console); win_newline(console);
rooms = g_slist_next(rooms); rooms = g_slist_next(rooms);
} }
} else { } else {
@ -477,7 +477,7 @@ cons_show_bookmarks(const GList *list)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (%d)", num); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", " (%d)", num);
} }
} }
win_save_newline(console); win_newline(console);
list = g_list_next(list); list = g_list_next(list);
} }
} }
@ -768,7 +768,7 @@ cons_show_account(ProfAccount *account)
if (caps->category != NULL) { if (caps->category != NULL) {
win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(console, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(console); win_newline(console);
} }
if (caps->software != NULL) { if (caps->software != NULL) {
win_vprint(console, '-', NULL, NO_EOL, 0, "", " Software: %s", caps->software); win_vprint(console, '-', NULL, NO_EOL, 0, "", " Software: %s", caps->software);
@ -777,7 +777,7 @@ cons_show_account(ProfAccount *account)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version);
} }
if ((caps->software != NULL) || (caps->software_version != NULL)) { if ((caps->software != NULL) || (caps->software_version != NULL)) {
win_save_newline(console); win_newline(console);
} }
if (caps->os != NULL) { if (caps->os != NULL) {
win_vprint(console, '-', NULL, NO_EOL, 0, "", " OS: %s", caps->os); win_vprint(console, '-', NULL, NO_EOL, 0, "", " OS: %s", caps->os);
@ -786,7 +786,7 @@ cons_show_account(ProfAccount *account)
win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(console, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version);
} }
if ((caps->os != NULL) || (caps->os_version != NULL)) { if ((caps->os != NULL) || (caps->os_version != NULL)) {
win_save_newline(console); win_newline(console);
} }
caps_destroy(caps); caps_destroy(caps);
} }

16
src/ui/core.c
View File

@ -2558,7 +2558,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
} }
} }
} }
win_save_newline(window); win_newline(window);
break; break;
case FIELD_TEXT_PRIVATE: case FIELD_TEXT_PRIVATE:
if (curr_value != NULL) { if (curr_value != NULL) {
@ -2567,10 +2567,10 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]"); win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", "[hidden]");
} }
} }
win_save_newline(window); win_newline(window);
break; break;
case FIELD_TEXT_MULTI: case FIELD_TEXT_MULTI:
win_save_newline(window); win_newline(window);
int index = 1; int index = 1;
while (curr_value != NULL) { while (curr_value != NULL) {
char *value = curr_value->data; char *value = curr_value->data;
@ -2599,7 +2599,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
break; break;
case FIELD_LIST_SINGLE: case FIELD_LIST_SINGLE:
if (curr_value != NULL) { if (curr_value != NULL) {
win_save_newline(window); win_newline(window);
char *value = curr_value->data; char *value = curr_value->data;
GSList *options = field->options; GSList *options = field->options;
GSList *curr_option = options; GSList *curr_option = options;
@ -2616,7 +2616,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
break; break;
case FIELD_LIST_MULTI: case FIELD_LIST_MULTI:
if (curr_value != NULL) { if (curr_value != NULL) {
win_save_newline(window); win_newline(window);
GSList *options = field->options; GSList *options = field->options;
GSList *curr_option = options; GSList *curr_option = options;
while (curr_option != NULL) { while (curr_option != NULL) {
@ -2637,10 +2637,10 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value); win_print(window, '-', NULL, NO_DATE | NO_EOL, THEME_ONLINE, "", value);
} }
} }
win_save_newline(window); win_newline(window);
break; break;
case FIELD_JID_MULTI: case FIELD_JID_MULTI:
win_save_newline(window); win_newline(window);
while (curr_value != NULL) { while (curr_value != NULL) {
char *value = curr_value->data; char *value = curr_value->data;
win_vprint(window, '-', NULL, 0, THEME_ONLINE, "", " %s", value); win_vprint(window, '-', NULL, 0, THEME_ONLINE, "", " %s", value);
@ -2654,7 +2654,7 @@ _ui_handle_form_field(ProfWin *window, char *tag, FormField *field)
win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", value); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", value);
} }
} }
win_save_newline(window); win_newline(window);
break; break;
default: default:
break; break;

18
src/ui/window.c
View File

@ -617,7 +617,7 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", occupant->status);
} }
win_save_newline(window); win_newline(window);
if (occupant->jid) { if (occupant->jid) {
win_vprint(window, '!', NULL, 0, 0, "", " Jid: %s", occupant->jid); win_vprint(window, '!', NULL, 0, 0, "", " Jid: %s", occupant->jid);
@ -649,7 +649,7 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
if (caps->category != NULL) { if (caps->category != NULL) {
win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(window, '!', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(window); win_newline(window);
} }
if (caps->software != NULL) { if (caps->software != NULL) {
win_vprint(window, '!', NULL, NO_EOL, 0, "", " Software: %s", caps->software); win_vprint(window, '!', NULL, NO_EOL, 0, "", " Software: %s", caps->software);
@ -658,7 +658,7 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version);
} }
if ((caps->software != NULL) || (caps->software_version != NULL)) { if ((caps->software != NULL) || (caps->software_version != NULL)) {
win_save_newline(window); win_newline(window);
} }
if (caps->os != NULL) { if (caps->os != NULL) {
win_vprint(window, '!', NULL, NO_EOL, 0, "", " OS: %s", caps->os); win_vprint(window, '!', NULL, NO_EOL, 0, "", " OS: %s", caps->os);
@ -667,7 +667,7 @@ win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occup
win_vprint(window, '!', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(window, '!', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version);
} }
if ((caps->os != NULL) || (caps->os_version != NULL)) { if ((caps->os != NULL) || (caps->os_version != NULL)) {
win_save_newline(window); win_newline(window);
} }
caps_destroy(caps); caps_destroy(caps);
} }
@ -742,7 +742,7 @@ win_show_info(ProfWin *window, PContact contact)
if (resource->status != NULL) { if (resource->status != NULL) {
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", resource->status); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, presence_colour, "", ", \"%s\"", resource->status);
} }
win_save_newline(window); win_newline(window);
Jid *jidp = jid_create_from_bare_and_resource(barejid, resource->name); Jid *jidp = jid_create_from_bare_and_resource(barejid, resource->name);
Capabilities *caps = caps_lookup(jidp->fulljid); Capabilities *caps = caps_lookup(jidp->fulljid);
@ -767,7 +767,7 @@ win_show_info(ProfWin *window, PContact contact)
if (caps->category != NULL) { if (caps->category != NULL) {
win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category); win_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", caps->category);
} }
win_save_newline(window); win_newline(window);
} }
if (caps->software != NULL) { if (caps->software != NULL) {
win_vprint(window, '-', NULL, NO_EOL, 0, "", " Software: %s", caps->software); win_vprint(window, '-', NULL, NO_EOL, 0, "", " Software: %s", caps->software);
@ -776,7 +776,7 @@ win_show_info(ProfWin *window, PContact contact)
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->software_version);
} }
if ((caps->software != NULL) || (caps->software_version != NULL)) { if ((caps->software != NULL) || (caps->software_version != NULL)) {
win_save_newline(window); win_newline(window);
} }
if (caps->os != NULL) { if (caps->os != NULL) {
win_vprint(window, '-', NULL, NO_EOL, 0, "", " OS: %s", caps->os); win_vprint(window, '-', NULL, NO_EOL, 0, "", " OS: %s", caps->os);
@ -785,7 +785,7 @@ win_show_info(ProfWin *window, PContact contact)
win_vprint(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version); win_vprint(window, '-', NULL, NO_DATE | NO_EOL, 0, "", ", %s", caps->os_version);
} }
if ((caps->os != NULL) || (caps->os_version != NULL)) { if ((caps->os != NULL) || (caps->os_version != NULL)) {
win_save_newline(window); win_newline(window);
} }
caps_destroy(caps); caps_destroy(caps);
} }
@ -898,7 +898,7 @@ win_println(ProfWin *window, const char * const message)
} }
void void
win_save_newline(ProfWin *window) win_newline(ProfWin *window)
{ {
win_print(window, '-', NULL, NO_DATE, 0, "", ""); win_print(window, '-', NULL, NO_DATE, 0, "", "");
} }

2
src/ui/window.h
View File

@ -171,7 +171,7 @@ void win_show_occupant_info(ProfWin *window, const char * const room, Occupant *
void win_vprint(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message, ...); void win_vprint(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message, ...);
void win_print(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message); void win_print(ProfWin *window, const char show_char, GTimeVal *tstamp, int flags, theme_item_t theme_item, const char * const from, const char * const message);
void win_println(ProfWin *window, const char * const message); void win_println(ProfWin *window, const char * const message);
void win_save_newline(ProfWin *window); void win_newline(ProfWin *window);
void win_redraw(ProfWin *window); void win_redraw(ProfWin *window);
void win_hide_subwin(ProfWin *window); void win_hide_subwin(ProfWin *window);
void win_show_subwin(ProfWin *window); void win_show_subwin(ProfWin *window);