From d5bb600a0406cec84c0a5f780b1e39d3f1d44000 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 21 Apr 2013 00:47:05 +0100
Subject: [PATCH] Moved cons_show_caps() to console module

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

diff --git a/src/ui/console.c b/src/ui/console.c
index 675f4ab0..54533ec5 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -384,6 +384,82 @@ cons_show_info(PContact pcontact)
     }
 }
 
+void
+cons_show_caps(const char * const contact, Resource *resource)
+{
+    WINDOW *win = console->win;
+    cons_show("");
+    const char *resource_presence = string_from_resource_presence(resource->presence);
+    window_show_time(console, '-');
+    window_presence_colour_on(console, resource_presence);
+    wprintw(console->win, "%s", contact);
+    window_presence_colour_off(console, resource_presence);
+    wprintw(win, ":\n");
+
+    if (resource->caps_str != NULL) {
+        Capabilities *caps = caps_get(resource->caps_str);
+        if (caps != NULL) {
+            // show identity
+            if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
+                window_show_time(console, '-');
+                wprintw(win, "Identity: ");
+                if (caps->name != NULL) {
+                    wprintw(win, "%s", caps->name);
+                    if ((caps->category != NULL) || (caps->type != NULL)) {
+                        wprintw(win, " ");
+                    }
+                }
+                if (caps->type != NULL) {
+                    wprintw(win, "%s", caps->type);
+                    if (caps->category != NULL) {
+                        wprintw(win, " ");
+                    }
+                }
+                if (caps->category != NULL) {
+                    wprintw(win, "%s", caps->category);
+                }
+                wprintw(win, "\n");
+            }
+            if (caps->software != NULL) {
+                window_show_time(console, '-');
+                wprintw(win, "Software: %s", caps->software);
+            }
+            if (caps->software_version != NULL) {
+                wprintw(win, ", %s", caps->software_version);
+            }
+            if ((caps->software != NULL) || (caps->software_version != NULL)) {
+                wprintw(win, "\n");
+            }
+            if (caps->os != NULL) {
+                window_show_time(console, '-');
+                wprintw(win, "OS: %s", caps->os);
+            }
+            if (caps->os_version != NULL) {
+                wprintw(win, ", %s", caps->os_version);
+            }
+            if ((caps->os != NULL) || (caps->os_version != NULL)) {
+                wprintw(win, "\n");
+            }
+
+            if (caps->features != NULL) {
+                window_show_time(console, '-');
+                wprintw(win, "Features:\n");
+                GSList *feature = caps->features;
+                while (feature != NULL) {
+                    window_show_time(console, '-');
+                    wprintw(win, "  %s\n", feature->data);
+                    feature = g_slist_next(feature);
+                }
+            }
+        }
+    }
+
+    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 8f329cb0..8dd9c1d1 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -1106,86 +1106,6 @@ win_show_room_broadcast(const char * const room_jid, const char * const message)
     }
 }
 
-void
-cons_show_caps(const char * const contact, Resource *resource)
-{
-    WINDOW *win = console->win;
-    cons_show("");
-    const char *resource_presence = string_from_resource_presence(resource->presence);
-    window_show_time(console, '-');
-    window_presence_colour_on(console, resource_presence);
-    wprintw(console->win, "%s", contact);
-    window_presence_colour_off(console, resource_presence);
-    wprintw(win, ":\n");
-
-    if (resource->caps_str != NULL) {
-        log_debug("Getting caps, caps_str: %s", resource->caps_str);
-        Capabilities *caps = caps_get(resource->caps_str);
-        if (caps != NULL) {
-            // show identity
-            if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) {
-                window_show_time(console, '-');
-                wprintw(win, "Identity: ");
-                if (caps->name != NULL) {
-                    wprintw(win, "%s", caps->name);
-                    if ((caps->category != NULL) || (caps->type != NULL)) {
-                        wprintw(win, " ");
-                    }
-                }
-                if (caps->type != NULL) {
-                    wprintw(win, "%s", caps->type);
-                    if (caps->category != NULL) {
-                        wprintw(win, " ");
-                    }
-                }
-                if (caps->category != NULL) {
-                    wprintw(win, "%s", caps->category);
-                }
-                wprintw(win, "\n");
-            }
-            if (caps->software != NULL) {
-                window_show_time(console, '-');
-                wprintw(win, "Software: %s", caps->software);
-            }
-            if (caps->software_version != NULL) {
-                wprintw(win, ", %s", caps->software_version);
-            }
-            if ((caps->software != NULL) || (caps->software_version != NULL)) {
-                wprintw(win, "\n");
-            }
-            if (caps->os != NULL) {
-                window_show_time(console, '-');
-                wprintw(win, "OS: %s", caps->os);
-            }
-            if (caps->os_version != NULL) {
-                wprintw(win, ", %s", caps->os_version);
-            }
-            if ((caps->os != NULL) || (caps->os_version != NULL)) {
-                wprintw(win, "\n");
-            }
-
-            if (caps->features != NULL) {
-                window_show_time(console, '-');
-                wprintw(win, "Features:\n");
-                GSList *feature = caps->features;
-                while (feature != NULL) {
-                    window_show_time(console, '-');
-                    wprintw(win, "  %s\n", feature->data);
-                    feature = g_slist_next(feature);
-                }
-            }
-        }
-    } else {
-        log_debug("No caps string found in resource");
-    }
-
-    if (current_index == 0) {
-        dirty = TRUE;
-    } else {
-        status_bar_new(0);
-    }
-}
-
 void
 cons_show_software_version(const char * const jid, const char * const  presence,
     const char * const name, const char * const version, const char * const os)