From d6c2bd0c6afbfc2e050a11b95a1d36f88a590188 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 21 Apr 2013 00:54:23 +0100
Subject: Moved cons_show_room_list() to console module

---
 src/ui/console.c | 25 +++++++++++++++++++++++++
 src/ui/windows.c | 20 --------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/ui/console.c b/src/ui/console.c
index 425b6f3a..d9f42e89 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -488,6 +488,31 @@ cons_show_software_version(const char * const jid, const char * const  presence,
     }
 }
 
+void
+cons_show_room_list(GSList *rooms, const char * const conference_node)
+{
+    if ((rooms != NULL) && (g_slist_length(rooms) > 0)) {
+        cons_show("Chat rooms at %s:", conference_node);
+        while (rooms != NULL) {
+            DiscoItem *room = rooms->data;
+            window_show_time(console, '-');
+            wprintw(console->win, "  %s", room->jid);
+            if (room->name != NULL) {
+                wprintw(console->win, ", (%s)", room->name);
+            }
+            wprintw(console->win, "\n");
+            rooms = g_slist_next(rooms);
+        }
+    } else {
+        cons_show("No chat rooms at %s", conference_node);
+    }
+
+    dirty = TRUE;
+    if (!win_current_is_console()) {
+        status_bar_new(0);
+    }
+}
+
 static void
 _cons_splash_logo(void)
 {
diff --git a/src/ui/windows.c b/src/ui/windows.c
index 529c9a0e..66da6316 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -1106,26 +1106,6 @@ win_show_room_broadcast(const char * const room_jid, const char * const message)
     }
 }
 
-void
-cons_show_room_list(GSList *rooms, const char * const conference_node)
-{
-    if ((rooms != NULL) && (g_slist_length(rooms) > 0)) {
-        cons_show("Chat rooms at %s:", conference_node);
-        while (rooms != NULL) {
-            DiscoItem *room = rooms->data;
-            window_show_time(console, '-');
-            wprintw(console->win, "  %s", room->jid);
-            if (room->name != NULL) {
-                wprintw(console->win, ", (%s)", room->name);
-            }
-            wprintw(console->win, "\n");
-            rooms = g_slist_next(rooms);
-        }
-    } else {
-        cons_show("No chat rooms at %s", conference_node);
-    }
-}
-
 void
 cons_show_disco_info(const char *jid, GSList *identities, GSList *features)
 {
-- 
cgit 1.4.1-2-gfad0