* Changed the logic of how we inform the client about dead buddies. Instead of pushi...

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index c553f24194a26ba22aba1cf5b1fcf82304fb42c1..8c7297350b2cb976ac8f66e10c553ed23595a68f 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -508,11 +508,6 @@ void xmpp_async_loop(void) {
  */
 void xmpp_login_hook(void) {
        xmpp_queue_event(XMPP_EVT_LOGIN, CC->cs_inet_email);
-
-       /* only do the protocol stuff if this is an XMPP session */
-       if (CC->h_command_function == xmpp_command_loop) {
-               xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster();
-       }
 }
 
 

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index ebb3576c2312c35104696d3a75dabfec512853ba..e53b26cc0bb5cc1b3fd42667eb90624cc662f1c4 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -126,6 +126,7 @@ void xmpp_destroy_buddy(char *presence_jid) {
        if (!XMPP) return;
        if (!XMPP->client_jid) return;
 
+       CtdlLogPrintf(CTDL_DEBUG, "\033[31mdestroy_buddy(%s)\033[0m\n", presence_jid);
        /* Transmit non-presence information */
        cprintf("<presence type=\"unavailable\" from=\"%s\" to=\"%s\"></presence>",
                presence_jid, XMPP->client_jid

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 47f2237d799b79cdbab6a069549d6852249eeebe..45bc9ed8ef0bf995abb94be991ee8f009d91f1ea 100644 (file)
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -62,6 +62,7 @@
  * Output a single roster item, for roster queries or pushes
  */
 void xmpp_roster_item(struct CitContext *cptr) {
+       CtdlLogPrintf(CTDL_DEBUG, "\033[32mxmpp_roster_item(%s)\033[0m\n", cptr->cs_inet_email);
        cprintf("<item jid=\"%s\" name=\"%s\" subscription=\"both\">",
                cptr->cs_inet_email,
                cptr->user.fullname
@@ -82,12 +83,14 @@ void xmpp_iq_roster_query(void)
        struct CitContext *cptr;
        int nContexts, i;
 
-       cprintf("<query xmlns=\"jabber:iq:roster\">");
+       CtdlLogPrintf(CTDL_DEBUG, "\033[36m ROSTER QUERY !! \033[0m\n");
 
+       cprintf("<query xmlns=\"jabber:iq:roster\">");
        cptr = CtdlGetContextArray(&nContexts);
        if (cptr) {
                for (i=0; i<nContexts; i++) {
                        if (xmpp_is_visible(&cptr[i])) {
+                               CtdlLogPrintf(CTDL_DEBUG, "Rosterizing %s\n", cptr[i].user.fullname);
                                xmpp_roster_item(&cptr[i]);
                        }
                }
@@ -109,6 +112,7 @@ xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
 void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
 {
        int supported_namespace = 0;
+       int roster_query = 0;
 
        /* We need to know before we begin the response whether this is a supported namespace, so
         * unfortunately all supported namespaces need to be defined here *and* down below where
@@ -142,6 +146,7 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
         */
 
        if (!strcasecmp(query_xmlns, "jabber:iq:roster:query")) {
+               roster_query = 1;
                xmpp_iq_roster_query();
        }
 
@@ -169,4 +174,12 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
        }
 
        cprintf("</iq>");
+
+       /* If we told the client who is on the roster, we also need to tell the client
+        * who is *not* on the roster.  (It's down here because we can't do it in the same
+        * stanza; this will be an unsolicited push.)
+        */
+       if (roster_query) {
+               xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster();
+       }
 }