libical, expat, and libsieve are now *required*.

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

diff --git a/citadel/modules/jabber/xmpp_queue.c b/citadel/modules/jabber/xmpp_queue.c
index b78f762ee92a891166dfcc29e55683e65af8f630..f11d101e710f38faf0d33985e79996c3833b8159 100644 (file)
--- a/citadel/modules/jabber/xmpp_queue.c
+++ b/citadel/modules/jabber/xmpp_queue.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <expat.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -42,9 +43,6 @@
 #include "internet_addressing.h"
 #include "md5.h"
 #include "ctdl_module.h"
-
-#ifdef HAVE_EXPAT
-#include <expat.h>
 #include "serv_xmpp.h"
 
 int queue_event_seq = 0;
@@ -99,11 +97,13 @@ void xmpp_queue_event(int event_type, char *email_addr) {
        end_critical_section(S_XMPP_QUEUE);
 
        /* Tell the sessions that something is happening */
+       begin_critical_section(S_SESSION_TABLE);
        for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
-               if (cptr->h_async_function == xmpp_async_loop) {
+               if ((cptr->logged_in) && (cptr->h_async_function == xmpp_async_loop)) {
                        cptr->async_waiting = 1;
                }
        }
+       end_critical_section(S_SESSION_TABLE);
 }
 
 
@@ -120,17 +120,11 @@ void xmpp_process_events(void) {
                        switch(xptr->event_type) {
 
                                case XMPP_EVT_LOGIN:
-                                       if (xptr->session_which_generated_this_event != CC->cs_pid) {
-                                               xmpp_presence_notify(xptr->event_jid, "available");
-                                       }
-                                       break;
-
                                case XMPP_EVT_LOGOUT:
                                        if (xptr->session_which_generated_this_event != CC->cs_pid) {
-                                               xmpp_presence_notify(xptr->event_jid, "unavailable");
+                                               xmpp_presence_notify(xptr->event_jid, xptr->event_type);
                                        }
                                        break;
-
                        }
 
                        if (xptr->event_seq > highest_event) {
@@ -141,6 +135,3 @@ void xmpp_process_events(void) {
 
        XMPP->last_event_processed = highest_event;
 }
-
-
-#endif /* HAVE_EXPAT */