--- a/mcabber/src/xmpp_iq.c	Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_iq.c	Sun Oct 11 15:59:53 2009 +0200
@@ -23,6 +23,19 @@
  * USA
  */
 
+#include <string.h>
+#include <sys/utsname.h>
+
+#include "xmpp_helper.h"
+#include "commands.h"
+#include "screen.h"
+#include "utils.h"
+#include "logprint.h"
+#include "settings.h"
+#include "caps.h"
+
+extern struct xmpp_error xmpp_errors[];
+
 static LmHandlerResult handle_iq_command_set_status(LmMessageHandler *h,
                                                     LmConnection *c,
                                                     LmMessage *m,
@@ -104,7 +117,7 @@
   return r;
 }
 
-static void send_iq_error(LmConnection *c, LmMessage *m, guint error)
+void send_iq_error(LmConnection *c, LmMessage *m, guint error)
 {
   LmMessage *r;
   r = lm_message_new_iq_error(m, error);
@@ -392,9 +405,9 @@
   return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 
-static LmHandlerResult handle_iq_commands(LmMessageHandler *h,
-                                          LmConnection *c,
-                                          LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_commands(LmMessageHandler *h,
+                                   LmConnection *c,
+                                   LmMessage *m, gpointer ud)
 {
   const char *requester_jid = NULL;
   LmMessageNode *cmd;
@@ -439,9 +452,9 @@
 }
 
 
-static LmHandlerResult handle_iq_disco_items(LmMessageHandler *h,
-                                             LmConnection *c,
-                                             LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_disco_items(LmMessageHandler *h,
+                                      LmConnection *c,
+                                      LmMessage *m, gpointer ud)
 {
   LmMessageNode *query;
   const char *node;
@@ -504,9 +517,9 @@
   }
 }
 
-static LmHandlerResult handle_iq_disco_info(LmMessageHandler *h,
-                                            LmConnection *c,
-                                            LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_disco_info(LmMessageHandler *h,
+                                     LmConnection *c,
+                                     LmMessage *m, gpointer ud)
 {
   LmMessage *r;
   LmMessageNode *query, *tmp;
@@ -532,8 +545,8 @@
   return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 
-static LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c,
-                                        LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c,
+                                 LmMessage *m, gpointer ud)
 {
   LmMessageNode *y;
   const char *fjid, *name, *group, *sub, *ask;
@@ -615,8 +628,8 @@
   return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 
-static LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c,
-                                       LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c,
+                               LmMessage *m, gpointer ud)
 {
   LmMessage *r;
 
@@ -631,8 +644,8 @@
   return difftime(time(NULL), iqlast);
 }
 
-static LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c,
-                                      LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c,
+                               LmMessage *m, gpointer ud)
 {
   LmMessage *r;
   LmMessageNode *query;
@@ -662,8 +675,8 @@
   return LM_HANDLER_RESULT_REMOVE_MESSAGE;
 }
 
-static LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c,
-                                         LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c,
+                                  LmMessage *m, gpointer ud)
 {
   LmMessage *r;
   LmMessageNode *query;
@@ -699,8 +712,8 @@
 }
 
 // This function borrows some code from the Pidgin project
-static LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c,
-                                      LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c,
+                               LmMessage *m, gpointer ud)
 {
   LmMessage *r;
   LmMessageNode *query;
@@ -746,8 +759,8 @@
 }
 
 // This function borrows some code from the Pidgin project
-static LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c,
-                                         LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c,
+                                  LmMessage *m, gpointer ud)
 {
   LmMessage *r;
   LmMessageNode *query;