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 cons_bad_show -> cons_show_error

Browse Source
This commit is contained in:
James Booth 2013-04-21 02:49:23 +01:00
parent f110a8fe3b
commit b2c08cfc43
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/command.c
View File

@ -1149,7 +1149,7 @@ _cmd_connect(gchar **args, struct cmd_help_t help)
}
if (conn_status == JABBER_DISCONNECTED) {
cons_bad_show("Connection attempt for %s failed.", jid);
cons_show_error("Connection attempt for %s failed.", jid);
log_debug("Connection attempt for %s failed", jid);
}
@ -1832,7 +1832,7 @@ _cmd_msg(gchar **args, struct cmd_help_t help)
}
if (ui_windows_full()) {
cons_bad_show("Windows all used, close a window and try again.");
cons_show_error("Windows all used, close a window and try again.");
return TRUE;
}
@ -2096,7 +2096,7 @@ _cmd_join(gchar **args, struct cmd_help_t help)
}
if (ui_windows_full()) {
cons_bad_show("Windows all used, close a window and try again.");
cons_show_error("Windows all used, close a window and try again.");
return TRUE;
}
@ -2256,7 +2256,7 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
if (!tinyurl_valid(url)) {
GString *error = g_string_new("/tiny, badly formed URL: ");
g_string_append(error, url);
cons_bad_show(error->str);
cons_show_error(error->str);
if (!win_current_is_console()) {
win_current_bad_show(error->str);
}
@ -2290,7 +2290,7 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
}
free(tiny);
} else {
cons_bad_show("Couldn't get tinyurl.");
cons_show_error("Couldn't get tinyurl.");
}
} else {
cons_show("/tiny can only be used in chat windows");

10
src/profanity.c
View File

@ -143,15 +143,15 @@ void
prof_handle_error_message(const char *from, const char *err_msg)
{
if (err_msg == NULL) {
cons_bad_show("Unknown error received from service.");
cons_show_error("Unknown error received from service.");
} else if (strcmp(err_msg, "conflict") == 0) {
if (win_current_is_groupchat()) {
win_current_show("Nickname already in use.");
} else {
cons_bad_show("Error received from server: %s", err_msg);
cons_show_error("Error received from server: %s", err_msg);
}
} else {
cons_bad_show("Error received from server: %s", err_msg);
cons_show_error("Error received from server: %s", err_msg);
}
win_show_error_msg(from, err_msg);
@ -212,7 +212,7 @@ prof_handle_gone(const char * const from)
void
prof_handle_failed_login(void)
{
cons_bad_show("Login failed.");
cons_show_error("Login failed.");
log_info("Login failed");
win_current_page_off();
}
@ -220,7 +220,7 @@ prof_handle_failed_login(void)
void
prof_handle_lost_connection(void)
{
cons_bad_show("Lost connection.");
cons_show_error("Lost connection.");
contact_list_clear();
chat_sessions_clear();
ui_disconnected();

2
src/ui/console.c
View File

@ -121,7 +121,7 @@ cons_show(const char * const msg, ...)
}
void
cons_bad_show(const char * const msg, ...)
cons_show_error(const char * const msg, ...)
{
va_list arg;
va_start(arg, msg);

2
src/ui/ui.h
View File

@ -146,7 +146,7 @@ void cons_show_account(ProfAccount *account);
void cons_debug(const char * const msg, ...);
void cons_show_time(void);
void cons_show_word(const char * const word);
void cons_bad_show(const char * const cmd, ...);
void cons_show_error(const char * const cmd, ...);
void cons_highlight_show(const char * const cmd);
void cons_show_contacts(GSList * list);
void cons_show_wins(void);

2
src/ui/windows.c
View File

@ -353,7 +353,7 @@ ui_show_incoming_msg(const char * const from, const char * const message,
_win_show_message(console->win, message);
}
cons_bad_show("Windows all used, close a window to respond.");
cons_show("Windows all used, close a window to respond.");
if (current_index == 0) {
dirty = TRUE;