about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2012-10-04 22:09:33 +0100
committerJames Booth <boothj5@gmail.com>2012-10-04 22:09:33 +0100
commitdcf5e9ef169aba102b9035f05b55e338de2001a8 (patch)
treedd64e16565a191aac34dd37496f7f9275ce78ee7
parent65022b3c2f437b118c92622aff5115bcf4568323 (diff)
downloadprofani-tty-dcf5e9ef169aba102b9035f05b55e338de2001a8.tar.gz
Removed /ros command
-rw-r--r--src/command.c23
-rw-r--r--src/profanity.c11
2 files changed, 1 insertions, 33 deletions
diff --git a/src/command.c b/src/command.c
index 240220c6..524c6c04 100644
--- a/src/command.c
+++ b/src/command.c
@@ -63,7 +63,6 @@ static gboolean _cmd_quit(const char * const inp, struct cmd_help_t help);
 static gboolean _cmd_help(const char * const inp, struct cmd_help_t help);
 static gboolean _cmd_prefs(const char * const inp, struct cmd_help_t help);
 static gboolean _cmd_who(const char * const inp, struct cmd_help_t help);
-static gboolean _cmd_ros(const char * const inp, struct cmd_help_t help);
 static gboolean _cmd_connect(const char * const inp, struct cmd_help_t help);
 static gboolean _cmd_msg(const char * const inp, struct cmd_help_t help);
 static gboolean _cmd_tiny(const char * const inp, struct cmd_help_t help);
@@ -153,15 +152,6 @@ static struct cmd_t main_commands[] =
           "Example : /tiny http://www.google.com",
           NULL } } },
 
-    { "/ros", 
-        _cmd_ros,
-        { "/ros", "List all contacts.",
-        { "/ros",
-          "----",
-          "List all contact currently on the chat hosts roster.",
-          "See /who for a more useful list of contacts who are currently online.",
-          NULL } } },
-
     { "/who", 
         _cmd_who,
         { "/who", "Find out who is online.",
@@ -561,19 +551,6 @@ _cmd_prefs(const char * const inp, struct cmd_help_t help)
 }
 
 static gboolean
-_cmd_ros(const char * const inp, struct cmd_help_t help)
-{
-    jabber_conn_status_t conn_status = jabber_get_connection_status();
-
-    if (conn_status != JABBER_CONNECTED)
-        cons_show("You are not currently connected.");
-    else
-        jabber_roster_request();
-
-    return TRUE;
-}
-
-static gboolean
 _cmd_who(const char * const inp, struct cmd_help_t help)
 {
     jabber_conn_status_t conn_status = jabber_get_connection_status();
diff --git a/src/profanity.c b/src/profanity.c
index f57b0ca9..329acb70 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -167,24 +167,15 @@ prof_handle_contact_offline(char *contact, char *show, char *status)
 void
 prof_handle_roster(GSList *roster)
 {
-    cons_show("Roster:");
     while (roster != NULL) {
         jabber_roster_entry *entry = roster->data;
-        if (entry->name != NULL) {
-            cons_show("%s (%s)", entry->name, entry->jid);
-
-        } else {
-            cons_show("%s", entry->jid);
-        }
-
+        
         // if contact not in contact list add them as offline
         if (find_contact(entry->jid) == NULL) {
             contact_list_add(entry->jid, "offline", NULL);
         }
        
         roster = g_slist_next(roster);
-
-        win_page_off();
     }
 
     g_slist_free_full(roster, (GDestroyNotify)_free_roster_entry);