From b14d5707cb4941489fa57236239ce08a18c81a7a Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 5 Jan 2014 21:17:07 +0000
Subject: Moved handle_disco_info to server_events

---
 src/profanity.c     | 7 -------
 src/profanity.h     | 2 --
 src/server_events.c | 7 +++++++
 src/server_events.h | 1 +
 src/xmpp/iq.c       | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/profanity.c b/src/profanity.c
index a532254d..e7a83b39 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -473,13 +473,6 @@ prof_handle_disco_items(GSList *items, const char *jid)
     ui_current_page_off();
 }
 
-void
-prof_handle_disco_info(const char *from, GSList *identities, GSList *features)
-{
-    cons_show_disco_info(from, identities, features);
-    ui_current_page_off();
-}
-
 /*
  * Take a line of input and process it, return TRUE if profanity is to
  * continue, FALSE otherwise
diff --git a/src/profanity.h b/src/profanity.h
index 8c5410b8..5351aa0e 100644
--- a/src/profanity.h
+++ b/src/profanity.h
@@ -69,8 +69,6 @@ void prof_handle_idle(void);
 void prof_handle_activity(void);
 void prof_handle_room_list(GSList *rooms, const char *conference_node);
 void prof_handle_disco_items(GSList *items, const char *jid);
-void prof_handle_disco_info(const char *from, GSList *identities,
-    GSList *features);
 void prof_handle_duck_help(const char * const result);
 void prof_handle_duck_result(const char * const result);
 void prof_handle_roster_add(const char * const barejid, const char * const name);
diff --git a/src/server_events.c b/src/server_events.c
index 565e4bcc..4e03d2d6 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -83,3 +83,10 @@ handle_software_version_result(const char * const jid, const char * const  prese
     cons_show_software_version(jid, presence, name, version, os);
     ui_current_page_off();
 }
+
+void
+handle_disco_info(const char *from, GSList *identities, GSList *features)
+{
+    cons_show_disco_info(from, identities, features);
+    ui_current_page_off();
+}
diff --git a/src/server_events.h b/src/server_events.h
index 9f5dfabc..13135281 100644
--- a/src/server_events.h
+++ b/src/server_events.h
@@ -29,5 +29,6 @@ void handle_lost_connection(void);
 void handle_failed_login(void);
 void handle_software_version_result(const char * const jid, const char * const  presence,
     const char * const name, const char * const version, const char * const os);
+void handle_disco_info(const char *from, GSList *identities, GSList *features);
 
 #endif
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index d3388cdd..8d42ede3 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -403,7 +403,7 @@ _iq_handle_discoinfo_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stan
                 child = xmpp_stanza_get_next(child);
             }
 
-            prof_handle_disco_info(from, identities, features);
+            handle_disco_info(from, identities, features);
             g_slist_free_full(features, free);
             g_slist_free_full(identities, (GDestroyNotify)_identity_destroy);
         }
-- 
cgit 1.4.1-2-gfad0