Renamed cons_bad_show -> cons_show_error

5 files changed, 13 insertions, 13 deletions

diff --git a/src/command/command.c b/src/command/command.c
index f5e84da9..d0f13c8b 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -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");
diff --git a/src/profanity.c b/src/profanity.c
index 2d37b817..0c872261 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -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();
diff --git a/src/ui/console.c b/src/ui/console.c
index cdd8641d..81502599 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -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);
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 8a246432..e1ecb83b 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -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);
diff --git a/src/ui/windows.c b/src/ui/windows.c
index 1c08f943..cf4ac35c 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -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;