Tidied ui dependencies

src/command/command.c

@@ -46,9 +46,9 @@
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
 #include "tools/tinyurl.h"
-#include "ui/ui.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
+#include "ui/ui.h"
 
 typedef char*(*autocompleter)(char*, int*);
 

src/command/commands.c

@@ -43,11 +43,9 @@
 #include "tools/autocomplete.h"
 #include "tools/parser.h"
 #include "tools/tinyurl.h"
-#include "ui/ui.h"
-#include "ui/window.h"
-#include "ui/windows.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
+#include "ui/ui.h"
 
 static void _update_presence(const resource_presence_t presence,
     const char * const show, gchar **args);

src/main.c

@@ -33,6 +33,7 @@
 #include "otr/otr.h"
 #endif
 #include "xmpp/xmpp.h"
+
 #include "ui/ui.h"
 
 static gboolean disable_tls = FALSE;

src/muc.c

@@ -29,8 +29,6 @@
 #include "jid.h"
 #include "tools/autocomplete.h"
 
-#include "ui/ui.h"
-
 typedef struct _muc_room_t {
     char *room; // e.g. test@conference.server
     char *nick; // e.g. Some User

src/otr/otrlibv4.c

@@ -24,8 +24,6 @@
 #include <libotr/privkey.h>
 #include <libotr/message.h>
 
-#include "ui/ui.h"
-
 OtrlPolicy
 otrlib_policy(void)
 {

src/profanity.c

@@ -47,8 +47,8 @@
 #include "otr/otr.h"
 #endif
 #include "resource.h"
-#include "ui/ui.h"
 #include "xmpp/xmpp.h"
+#include "ui/ui.h"
 
 static void _handle_idle_time(void);
 static void _init(const int disable_tls, char *log_level);

src/server_events.c

@@ -29,14 +29,13 @@
 #include "config/preferences.h"
 #include "config/account.h"
 #include "roster_list.h"
-#include "ui/ui.h"
-
-#include "ui/windows.h"
 
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
 #endif
 
+#include "ui/ui.h"
+
 // handle presence stanza errors
 void
 handle_presence_error(const char *from, const char * const type,
@@ -503,3 +502,9 @@ handle_autoping_cancel(void)
     cons_show_error("Server ping not supported, autoping disabled.");
     ui_current_page_off();
 }
+
+void
+handle_bookmark_autojoin(char *jid)
+{
+    ui_room_join(jid);
+}

src/server_events.h

@@ -78,5 +78,6 @@ void handle_message_error(const char * const from, const char * const type,
     const char * const err_msg);
 void handle_presence_error(const char *from, const char * const type,
     const char *err_msg);
+void handle_bookmark_autojoin(char *jid);
 
 #endif

src/xmpp/bookmark.c

@@ -30,7 +30,7 @@
 #include "common.h"
 #include "log.h"
 #include "muc.h"
-#include "ui/ui.h"
+#include "server_events.h"
 #include "xmpp/connection.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
@@ -324,7 +324,7 @@ _bookmark_handle_result(xmpp_conn_t * const conn,
                 if (!muc_room_is_active(room_jid->barejid)) {
                     presence_join_room(jid, name, NULL);
                     /* TODO: this should be removed after fixing #195 */
-                    ui_room_join(jid);
+                    handle_bookmark_autojoin(jid);
                 }
                 jid_destroy(room_jid);
             } else {

src/xmpp/message.c

@@ -37,7 +37,6 @@
 #include "roster_list.h"
 #include "xmpp/stanza.h"
 #include "xmpp/xmpp.h"
-#include "ui/ui.h"
 
 #define HANDLE(ns, type, func) xmpp_handler_add(conn, func, ns, STANZA_NAME_MESSAGE, type, ctx)