Revert some of the later changes in XMPP and fix other parts

[citadel.git] / citadel / modules / xmpp / xmpp_queue.c

diff --git a/citadel/modules/xmpp/xmpp_queue.c b/citadel/modules/xmpp/xmpp_queue.c
index 024336df871e7de743e3bebd19bbcbba902b45f9..530ea5a76942131f5b69dba7adfa563377380478 100644 (file)
--- a/citadel/modules/xmpp/xmpp_queue.c
+++ b/citadel/modules/xmpp/xmpp_queue.c
@@ -57,7 +57,6 @@
 #include "serv_xmpp.h"
 
 int queue_event_seq = 0;
-struct xmpp_event *xmpp_queue = NULL;
 
 void xmpp_queue_event(int event_type, char *email_addr) {
 
@@ -67,7 +66,7 @@ void xmpp_queue_event(int event_type, char *email_addr) {
        int purged_something = 0;
        struct CitContext *cptr;
 
-       XMPP_syslog(LOG_DEBUG, "xmpp_queue_event(%d, %s)\n", event_type, email_addr);
+       syslog(LOG_DEBUG, "xmpp_queue_event(%d, %s)\n", event_type, email_addr);
 
        /* Purge events more than a minute old */
        begin_critical_section(S_XMPP_QUEUE);
@@ -163,14 +162,3 @@ void xmpp_cleanup_events(void)
         end_critical_section(S_XMPP_QUEUE);
 
 }
-
-CTDL_MODULE_INIT(xmpp_queue)
-{
-       if (!threading) {
-
-               CtdlRegisterCleanupHook(xmpp_cleanup_events);
-       }
-
-       /* return our module name for the log */
-       return "xmpp_queue";
-}