sys/time.h no longer needed on modern systems

[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..82e60647e9bd03d1cfbf16d735cda970ce3902b3 100644 (file)
--- a/citadel/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/modules/xmpp/xmpp_query_namespace.c
@@ -1,21 +1,14 @@
 /*
  * Handle <iq> <get> <query> type situations (namespace queries)
  *
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2014 by Art Cancro
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -61,13 +54,12 @@
  */
 void xmpp_roster_item(struct CitContext *cptr)
 {
-       struct CitContext *CCC=CC;
-
        XPrint(HKEY("item"), 0,
-              XCPROPERTY("subscription", "both"),
-              XPROPERTY("jid",  CCC->cs_inet_email, strlen(CCC->cs_inet_email)),
-              XPROPERTY("name", cptr->user.fullname, strlen(cptr->user.fullname)),
-              TYPE_ARGEND);
+               XCPROPERTY("subscription", "both"),
+               XPROPERTY("jid",  cptr->cs_inet_email, strlen(cptr->cs_inet_email)),
+               XPROPERTY("name", cptr->user.fullname, strlen(cptr->user.fullname)),
+               TYPE_ARGEND
+       );
 
        XPrint(HKEY("group"), XCLOSED,
               XCFGBODY(c_humannode),
@@ -112,7 +104,7 @@ 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;
@@ -134,7 +126,7 @@ 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.
@@ -150,8 +142,9 @@ void xmpp_query_namespace(char *iq_id, char *iq_from, char *iq_to, char *query_x
 
        XPrint(HKEY("iq"), 0,
               XPROPERTY("type", TypeStr, TLen),
-              XOPROPERTY("to",  iq_from, strlen(iq_from)),
-              XPROPERTY("id",   iq_id,   strlen(iq_id)));
+              XSPROPERTY("to",  IQ->from),
+              XSPROPERTY("id",   IQ->id),
+              TYPE_ARGEND);
 
        /*
         * Is this a query we know how to handle?