Apply patches sugested by Taroe Hong plus some more bugfixes.

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

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 0da671c5f3aa9692236cc405d1b068b17f01427d..d943df16db6f7e1e7139fec860ca41b2cca0a41a 100644 (file)
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -65,7 +65,7 @@ void xmpp_roster_item(struct CitContext *cptr)
 
        XPrint(HKEY("item"), 0,
               XCPROPERTY("subscription", "both"),
-              XPROPERTY("jid",  CCC->cs_inet_email, strlen(CCC->cs_inet_email)),
+              XPROPERTY("jid",  cptr->cs_inet_email, strlen(cptr->cs_inet_email)),
               XPROPERTY("name", cptr->user.fullname, strlen(cptr->user.fullname)),
               TYPE_ARGEND);
 
@@ -112,13 +112,11 @@ xmpp_query_namespace(purple5b5c1e5a, , vcard-temp:query)
  *
  */
 
-void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_xmlns)
+void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_to*/, char *query_xmlns)
 {
        int supported_namespace = 0;
        int roster_query = 0;
-       const char *TypeStr;
-       long TLen;
-       ConstStr Type[] = {
+       static const ConstStr Type[] = {
                {HKEY("result")},
                {HKEY("error")}
        };
@@ -134,25 +132,25 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
                supported_namespace = 1;
        }
 
-       XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", iq_id, iq_from, iq_to, query_xmlns);
+       XMPP_syslog(LOG_DEBUG, "xmpp_query_namespace(%s, %s, %s, %s)\n", ChrPtr(IQ->id), ChrPtr(IQ->from), ChrPtr(IQ->to), query_xmlns);
 
        /*
         * Beginning of query result.
         */
        if (supported_namespace) {
-               TypeStr = Type[0].Key;
-               TLen    = Type[0].len;
+               XPrint(HKEY("iq"), 0,
+                      XPROPERTY("type", Type[0].Key, Type[0].len),
+                      XSPROPERTY("to",  IQ->from),
+                      XSPROPERTY("id",   IQ->id),
+                      TYPE_ARGEND);
        }
        else {
-               TypeStr = Type[1].Key;
-               TLen    = Type[1].len;
+               XPrint(HKEY("iq"), 0,
+                      XPROPERTY("type", Type[1].Key, Type[1].len),
+                      XSPROPERTY("id",   IQ->id),
+                      TYPE_ARGEND);
        }
 
-       XPrint(HKEY("iq"), 0,
-              XPROPERTY("type", TypeStr, TLen),
-              XOPROPERTY("to",  iq_from, strlen(iq_from)),
-              XPROPERTY("id",   iq_id,   strlen(iq_id)));
-
        /*
         * Is this a query we know how to handle?
         */