X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_query_namespace.c;h=82e60647e9bd03d1cfbf16d735cda970ce3902b3;hb=ebc64e2caae8740dd047e5317de2172eb3f44fc3;hp=8bb9b442b283082cce6574b7c1a622c640a32aba;hpb=85a4d8d0b5af0edda2a0fa27c66457b775eb1209;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_query_namespace.c b/citadel/modules/xmpp/xmpp_query_namespace.c
index 8bb9b442b..82e60647e 100644
--- 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),
@@ -151,7 +143,8 @@ void xmpp_query_namespace(TheToken_iq *IQ/*char *iq_id, char *iq_from, char *iq_
 	XPrint(HKEY("iq"), 0,
 	       XPROPERTY("type", TypeStr, TLen),
 	       XSPROPERTY("to",  IQ->from),
-	       XSPROPERTY("id",   IQ->id));
+	       XSPROPERTY("id",   IQ->id),
+	       TYPE_ARGEND);
 
 	/*
 	 * Is this a query we know how to handle?