From 2fafcf001344f85965a0d1984860f092b7e19b7e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 12 Apr 2014 15:20:19 +0100
Subject: [PATCH] Revert "Added ui_already_connected"

This reverts commit e97ec56fce641554ff7aa2ff9f0583e1fb9fc364.
---
 src/command/commands.c   |  2 +-
 src/ui/core.c            |  7 -------
 src/ui/ui.h              |  1 -
 tests/test_cmd_connect.c |  4 +++-
 tests/ui/mock_ui.c       | 11 -----------
 tests/ui/mock_ui.h       |  4 +---
 6 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/command/commands.c b/src/command/commands.c
index 2dcb4a0e..a7deb17a 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -65,7 +65,7 @@ cmd_connect(gchar **args, struct cmd_help_t help)
     jabber_conn_status_t conn_status = jabber_get_connection_status();
 
     if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) {
-        ui_already_connected();
+        cons_show("You are either connected already, or a login is in process.");
         result = TRUE;
     } else {
         char *user = args[0];
diff --git a/src/ui/core.c b/src/ui/core.c
index b3b4eadb..3cb05fe8 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -544,12 +544,6 @@ _ui_unknown_command(const char * const input)
     cons_show("Unknown command: %s", input);
 }
 
-static void
-_ui_already_connected(void)
-{
-    cons_show("You are either connected already, or a login is in process.");
-}
-
 static void
 _ui_disconnected(void)
 {
@@ -1928,5 +1922,4 @@ ui_init_module(void)
     ui_replace_input = _ui_replace_input;
     ui_invalid_command_usage = _ui_invalid_command_usage;
     ui_unknown_command = _ui_unknown_command;
-    ui_already_connected = _ui_already_connected;
 }
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 7543e6a8..fc689305 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -161,7 +161,6 @@ void (*ui_replace_input)(char *input, const char * const new_input, int *size);
 
 void (*ui_invalid_command_usage)(const char * const usage, void (**setting_func)(void));
 void (*ui_unknown_command)(const char * const input);
-void (*ui_already_connected)(void);
 
 // console window actions
 void (*cons_show)(const char * const msg, ...);
diff --git a/tests/test_cmd_connect.c b/tests/test_cmd_connect.c
index 76493115..33f49164 100644
--- a/tests/test_cmd_connect.c
+++ b/tests/test_cmd_connect.c
@@ -19,11 +19,13 @@
 
 static void test_with_connection_status(jabber_conn_status_t status)
 {
-    stub_ui_already_connected();
+    mock_cons_show();
     CommandHelp *help = malloc(sizeof(CommandHelp));
 
     mock_connection_status(status);
 
+    expect_cons_show("You are either connected already, or a login is in process.");
+
     gboolean result = cmd_connect(NULL, *help);
     assert_true(result);
 
diff --git a/tests/ui/mock_ui.c b/tests/ui/mock_ui.c
index 0e01be25..94f8e3c3 100644
--- a/tests/ui/mock_ui.c
+++ b/tests/ui/mock_ui.c
@@ -82,11 +82,6 @@ char * _stub_ui_ask_password(void)
     return NULL;
 }
 
-static
-void _stub_ui_already_connected(void)
-{
-}
-
 static
 win_type_t _mock_ui_current_win_type(void)
 {
@@ -263,12 +258,6 @@ stub_cons_show(void)
     cons_show = _stub_cons_show;
 }
 
-void
-stub_ui_already_connected(void)
-{
-    ui_already_connected = _stub_ui_already_connected;
-}
-
 void
 stub_ui_handle_recipient_not_found(void)
 {
diff --git a/tests/ui/mock_ui.h b/tests/ui/mock_ui.h
index 70c9f3b3..5b984615 100644
--- a/tests/ui/mock_ui.h
+++ b/tests/ui/mock_ui.h
@@ -66,6 +66,4 @@ void cons_show_roster_expect(GSList *list);
 
 void ui_switch_win_expect_and_return(int given_i, gboolean result);
 
-void stub_ui_already_connected(void);
-
-#endif
\ No newline at end of file
+#endif