aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Renamed win_save_println -> win_println

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

8
src/command/commands.c
View File

@ -1738,7 +1738,7 @@ cmd_status(gchar **args, struct cmd_help_t help)
if (pcontact != NULL) { if (pcontact != NULL) {
win_show_contact(window, pcontact); win_show_contact(window, pcontact);
} else { } else {
win_save_println(window, "Error getting contact info."); win_println(window, "Error getting contact info.");
} }
} }
break; break;
@ -1753,7 +1753,7 @@ cmd_status(gchar **args, struct cmd_help_t help)
if (occupant) { if (occupant) {
win_show_occupant(window, occupant); win_show_occupant(window, occupant);
} else { } else {
win_save_println(window, "Error getting contact info."); win_println(window, "Error getting contact info.");
} }
jid_destroy(jid); jid_destroy(jid);
} }
@ -1819,7 +1819,7 @@ cmd_info(gchar **args, struct cmd_help_t help)
if (pcontact != NULL) { if (pcontact != NULL) {
win_show_info(window, pcontact); win_show_info(window, pcontact);
} else { } else {
win_save_println(window, "Error getting contact info."); win_println(window, "Error getting contact info.");
} }
} }
break; break;
@ -1834,7 +1834,7 @@ cmd_info(gchar **args, struct cmd_help_t help)
if (occupant) { if (occupant) {
win_show_occupant_info(window, jid->barejid, occupant); win_show_occupant_info(window, jid->barejid, occupant);
} else { } else {
win_save_println(window, "Error getting contact info."); win_println(window, "Error getting contact info.");
} }
jid_destroy(jid); jid_destroy(jid);
} }

34
src/ui/console.c
View File

@ -86,7 +86,7 @@ cons_debug(const char * const msg, ...)
va_start(arg, msg); va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg); g_string_vprintf(fmt_msg, msg, arg);
win_save_println(console, fmt_msg->str); win_println(console, fmt_msg->str);
g_string_free(fmt_msg, TRUE); g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
} }
@ -100,7 +100,7 @@ cons_show(const char * const msg, ...)
va_start(arg, msg); va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg); g_string_vprintf(fmt_msg, msg, arg);
win_save_println(console, fmt_msg->str); win_println(console, fmt_msg->str);
g_string_free(fmt_msg, TRUE); g_string_free(fmt_msg, TRUE);
va_end(arg); va_end(arg);
} }
@ -177,13 +177,13 @@ cons_about(void)
} }
win_vprint(console, '-', NULL, 0, 0, "", "Copyright (C) 2012 - 2015 James Booth <%s>.", PACKAGE_BUGREPORT); win_vprint(console, '-', NULL, 0, 0, "", "Copyright (C) 2012 - 2015 James Booth <%s>.", PACKAGE_BUGREPORT);
win_save_println(console, "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>"); win_println(console, "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>");
win_save_println(console, ""); win_println(console, "");
win_save_println(console, "This is free software; you are free to change and redistribute it."); win_println(console, "This is free software; you are free to change and redistribute it.");
win_save_println(console, "There is NO WARRANTY, to the extent permitted by law."); win_println(console, "There is NO WARRANTY, to the extent permitted by law.");
win_save_println(console, ""); win_println(console, "");
win_save_println(console, "Type '/help' to show complete help."); win_println(console, "Type '/help' to show complete help.");
win_save_println(console, ""); win_println(console, "");
if (prefs_get_boolean(PREF_VERCHECK)) { if (prefs_get_boolean(PREF_VERCHECK)) {
cons_check_version(FALSE); cons_check_version(FALSE);
@ -206,12 +206,12 @@ cons_check_version(gboolean not_available_msg)
if (relase_valid) { if (relase_valid) {
if (release_is_new(latest_release)) { if (release_is_new(latest_release)) {
win_vprint(console, '-', NULL, 0, 0, "", "A new version of Profanity is available: %s", latest_release); win_vprint(console, '-', NULL, 0, 0, "", "A new version of Profanity is available: %s", latest_release);
win_save_println(console, "Check <http://www.profanity.im> for details."); win_println(console, "Check <http://www.profanity.im> for details.");
win_save_println(console, ""); win_println(console, "");
} else { } else {
if (not_available_msg) { if (not_available_msg) {
win_save_println(console, "No new version available."); win_println(console, "No new version available.");
win_save_println(console, ""); win_println(console, "");
} }
} }
@ -248,7 +248,7 @@ cons_show_wins(void)
GSList *curr = window_strings; GSList *curr = window_strings;
while (curr != NULL) { while (curr != NULL) {
win_save_println(console, curr->data); win_println(console, curr->data);
curr = g_slist_next(curr); curr = g_slist_next(curr);
} }
g_slist_free_full(window_strings, free); g_slist_free_full(window_strings, free);
@ -337,7 +337,7 @@ cons_show_caps(const char * const fulljid, resource_presence_t presence)
} }
if (caps->features != NULL) { if (caps->features != NULL) {
win_save_println(console, "Features:"); win_println(console, "Features:");
GSList *feature = caps->features; GSList *feature = caps->features;
while (feature != NULL) { while (feature != NULL) {
win_vprint(console, '-', NULL, 0, 0, "", " %s", feature->data); win_vprint(console, '-', NULL, 0, 0, "", " %s", feature->data);
@ -721,7 +721,7 @@ cons_show_account(ProfAccount *account)
GList *curr = resources; GList *curr = resources;
if (curr != NULL) { if (curr != NULL) {
win_save_println(console, "Resources:"); win_println(console, "Resources:");
// sort in order of availability // sort in order of availability
while (curr != NULL) { while (curr != NULL) {
@ -1574,7 +1574,7 @@ static void
_cons_splash_logo(void) _cons_splash_logo(void)
{ {
ProfWin *console = wins_get_console(); ProfWin *console = wins_get_console();
win_save_println(console, "Welcome to"); win_println(console, "Welcome to");
win_print(console, '-', NULL, 0, THEME_SPLASH, "", " ___ _ "); win_print(console, '-', NULL, 0, THEME_SPLASH, "", " ___ _ ");
win_print(console, '-', NULL, 0, THEME_SPLASH, "", " / __) (_)_ "); win_print(console, '-', NULL, 0, THEME_SPLASH, "", " / __) (_)_ ");

6
src/ui/core.c
View File

@ -389,7 +389,7 @@ ui_message_receipt(const char * const barejid, const char * const id)
ProfWin *win = (ProfWin*) chatwin; ProfWin *win = (ProfWin*) chatwin;
GString *message = g_string_new("Message received: "); GString *message = g_string_new("Message received: ");
g_string_append(message, id); g_string_append(message, id);
win_save_println(win, message->str); win_println(win, message->str);
g_string_free(message, TRUE); g_string_free(message, TRUE);
} }
} }
@ -1273,7 +1273,7 @@ ui_current_print_line(const char * const msg, ...)
va_start(arg, msg); va_start(arg, msg);
GString *fmt_msg = g_string_new(NULL); GString *fmt_msg = g_string_new(NULL);
g_string_vprintf(fmt_msg, msg, arg); g_string_vprintf(fmt_msg, msg, arg);
win_save_println(window, fmt_msg->str); win_println(window, fmt_msg->str);
va_end(arg); va_end(arg);
g_string_free(fmt_msg, TRUE); g_string_free(fmt_msg, TRUE);
} }
@ -2699,7 +2699,7 @@ ui_show_form_field(ProfWin *window, DataForm *form, char *tag)
{ {
FormField *field = form_get_field_by_tag(form, tag); FormField *field = form_get_field_by_tag(form, tag);
_ui_handle_form_field(window, tag, field); _ui_handle_form_field(window, tag, field);
win_save_println(window, ""); win_println(window, "");
} }
void void

2
src/ui/window.c
View File

@ -892,7 +892,7 @@ win_print(ProfWin *window, const char show_char, GTimeVal *tstamp,
} }
void void
win_save_println(ProfWin *window, const char * const message) win_println(ProfWin *window, const char * const message)
{ {
win_print(window, '-', NULL, 0, 0, "", message); win_print(window, '-', NULL, 0, 0, "", message);
} }

2
src/ui/window.h
View File

@ -170,7 +170,7 @@ void win_show_info(ProfWin *window, PContact contact);
void win_show_occupant_info(ProfWin *window, const char * const room, Occupant *occupant); void win_show_occupant_info(ProfWin *window, const char * const room, Occupant *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_save_println(ProfWin *window, const char * const message); void win_println(ProfWin *window, const char * const message);
void win_save_newline(ProfWin *window); void win_save_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);