diff options
| -rw-r--r-- | command.c | 14 | ||||
| -rw-r--r-- | windows.c | 20 | ||||
| -rw-r--r-- | windows.h | 4 |
3 files changed, 7 insertions, 31 deletions
diff --git a/command.c b/command.c index 772d171f..ea36aa82 100644 --- a/command.c +++ b/command.c @@ -112,10 +112,10 @@ static gboolean _cmd_connect(const char * const inp) jabber_status_t conn_status = jabber_connection_status(); if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) { - cons_not_disconnected(); + cons_show("You are either connected already, or a login is in process."); result = TRUE; } else if (strlen(inp) < 10) { - cons_bad_connect(); + cons_show("Usage: /connect user@host"); result = TRUE; } else { char *user; @@ -156,7 +156,7 @@ static gboolean _cmd_ros(void) jabber_status_t conn_status = jabber_connection_status(); if (conn_status != JABBER_CONNECTED) - cons_not_connected(); + cons_show("You are not currently connected."); else jabber_roster_request(); @@ -168,7 +168,7 @@ static gboolean _cmd_who(void) jabber_status_t conn_status = jabber_connection_status(); if (conn_status != JABBER_CONNECTED) { - cons_not_connected(); + cons_show("You are not currently connected."); } else { GSList *list = get_contact_list(); cons_show_online_contacts(list); @@ -185,7 +185,7 @@ static gboolean _cmd_msg(const char * const inp) jabber_status_t conn_status = jabber_connection_status(); if (conn_status != JABBER_CONNECTED) { - cons_not_connected(); + cons_show("You are not currently connected."); } else { // copy input char inp_cpy[strlen(inp) + 1]; @@ -201,10 +201,10 @@ static gboolean _cmd_msg(const char * const inp) jabber_send(msg, usr); win_show_outgoing_msg("me", usr, msg); } else { - cons_bad_message(); + cons_show("Usage: /msg user@host message"); } } else { - cons_bad_message(); + cons_show("Usage: /msg user@host message"); } } diff --git a/windows.c b/windows.c index db3a6a84..eeb2a5ab 100644 --- a/windows.c +++ b/windows.c @@ -347,26 +347,6 @@ void cons_bad_command(const char * const cmd) dirty = TRUE; } -void cons_bad_connect(void) -{ - cons_show("Usage: /connect user@host"); -} - -void cons_not_disconnected(void) -{ - cons_show("You are either connected already, or a login is in process."); -} - -void cons_not_connected(void) -{ - cons_show("You are not currently connected."); -} - -void cons_bad_message(void) -{ - cons_show("Usage: /msg user@host message"); -} - void win_handle_special_keys(const int * const ch) { _win_handle_switch(ch); diff --git a/windows.h b/windows.h index c264bd0e..d5a951fa 100644 --- a/windows.h +++ b/windows.h @@ -72,10 +72,6 @@ void win_set_beep(int val); // console window actions void cons_help(void); void cons_bad_command(const char * const cmd); -void cons_bad_connect(void); -void cons_not_disconnected(void); -void cons_not_connected(void); -void cons_bad_message(void); void cons_show(const char * const cmd); void cons_bad_show(const char * const cmd); void cons_highlight_show(const char * const cmd); |