From 107fdd355e487793e53799ce3ebed0659263a2f7 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 14 Dec 2013 15:34:17 +0000
Subject: Added simple mock test, refactored roster

---
 src/command/command.c | 8 ++++----
 src/command/command.h | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/command')

diff --git a/src/command/command.c b/src/command/command.c
index a213d141..0ab8b013 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -36,6 +36,7 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "contact.h"
+#include "roster_list.h"
 #include "jid.h"
 #include "log.h"
 #include "muc.h"
@@ -133,7 +134,6 @@ static gboolean _cmd_prefs(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_priority(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_quit(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_reconnect(gchar **args, struct cmd_help_t help);
-static gboolean _cmd_rooms(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_bookmark(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_roster(gchar **args, struct cmd_help_t help);
 static gboolean _cmd_software(gchar **args, struct cmd_help_t help);
@@ -2455,7 +2455,7 @@ _cmd_roster(gchar **args, struct cmd_help_t help)
 
         char *jid = args[1];
 
-        roster_remove(jid);
+        roster_send_remove(jid);
 
         return TRUE;
     }
@@ -2916,13 +2916,13 @@ _cmd_decline(gchar **args, struct cmd_help_t help)
     return TRUE;
 }
 
-static gboolean
+gboolean
 _cmd_rooms(gchar **args, 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 currenlty connected.");
+        cons_show("You are not currently connected.");
         return TRUE;
     }
 
diff --git a/src/command/command.h b/src/command/command.h
index c20413c8..8743d662 100644
--- a/src/command/command.h
+++ b/src/command/command.h
@@ -49,4 +49,6 @@ void cmd_history_append(char *inp);
 char *cmd_history_previous(char *inp, int *size);
 char *cmd_history_next(char *inp, int *size);
 
+gboolean _cmd_rooms(gchar **args, struct cmd_help_t help);
+
 #endif
-- 
cgit 1.4.1-2-gfad0