# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1162420848 -3600
# Node ID c89e7993c4d9d12ea60f624a3a5f8eb6f1e351d3
# Parent  eb416c9633b525b659b4d0ec70586174e870827a
Answer IQ disco#info queries

diff -r eb416c9633b5 -r c89e7993c4d9 mcabber/libjabber/jabber.h
--- a/mcabber/libjabber/jabber.h	Wed Nov 01 21:48:01 2006 +0100
+++ b/mcabber/libjabber/jabber.h	Wed Nov 01 23:40:48 2006 +0100
@@ -281,6 +281,7 @@
 #define NS_DISCO_ITEMS "http://jabber.org/protocol/disco#items"
 #define NS_IQ_AUTH    "http://jabber.org/features/iq-auth"
 #define NS_REGISTER_FEATURE "http://jabber.org/features/iq-register"
+#define NS_MUC       "http://jabber.org/protocol/muc"
 #define NS_CHATSTATES "http://jabber.org/protocol/chatstates"
 
 #define NS_XDBGINSERT "jabber:xdb:ginsert"
diff -r eb416c9633b5 -r c89e7993c4d9 mcabber/src/jab_iq.c
--- a/mcabber/src/jab_iq.c	Wed Nov 01 21:48:01 2006 +0100
+++ b/mcabber/src/jab_iq.c	Wed Nov 01 23:40:48 2006 +0100
@@ -445,19 +445,48 @@
   }
 }
 
+static void handle_iq_disco_info(jconn conn, char *from, const char *id,
+                                 xmlnode xmldata)
+{
+  xmlnode x, y;
+  xmlnode myquery;
+
+  x = jutil_iqnew(JPACKET__RESULT, NS_DISCO_INFO);
+  xmlnode_put_attrib(x, "id", id);
+  xmlnode_put_attrib(x, "to", xmlnode_get_attrib(xmldata, "from"));
+  myquery = xmlnode_get_tag(x, "query");
+
+  y = xmlnode_insert_tag(myquery, "identity");
+  xmlnode_put_attrib(y, "category", "client");
+  xmlnode_put_attrib(y, "type", "pc");
+  xmlnode_put_attrib(y, "name", PACKAGE_NAME);
+
+  xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
+                     "var", NS_DISCO_INFO);
+  xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
+                     "var", NS_MUC);
+  xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
+                     "var", NS_CHATSTATES);
+  xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
+                     "var", NS_TIME);
+  xmlnode_put_attrib(xmlnode_insert_tag(myquery, "feature"),
+                     "var", NS_VERSION);
+
+  jab_send(jc, x);
+  xmlnode_free(x);
+}
+
 static void handle_iq_version(jconn conn, char *from, const char *id,
                               xmlnode xmldata)
 {
-  xmlnode senderquery, x;
+  xmlnode x;
   xmlnode myquery;
   char *os = NULL;
   char *ver = mcabber_version();
 
-  // "from" has already been converted to user locale
   scr_LogPrint(LPRINT_LOGNORM, "Received an IQ version request from <%s>",
                from);
 
-  senderquery = xmlnode_get_tag(xmldata, "query");
   if (!settings_opt_get_int("iq_version_hide_os")) {
     struct utsname osinfo;
     uname(&osinfo);
@@ -486,7 +515,7 @@
 static void handle_iq_time(jconn conn, char *from, const char *id,
                               xmlnode xmldata)
 {
-  xmlnode senderquery, x;
+  xmlnode x;
   xmlnode myquery;
   char *buf, *utf8_buf;
   time_t now_t;
@@ -494,11 +523,9 @@
 
   time(&now_t);
 
-  // "from" has already been converted to user locale
   scr_LogPrint(LPRINT_LOGNORM, "Received an IQ time request from <%s>", from);
 
   buf = g_new0(char, 512);
-  senderquery = xmlnode_get_tag(xmldata, "query");
 
   x = jutil_iqnew(JPACKET__RESULT, NS_TIME);
   xmlnode_put_attrib(x, "id", id);
@@ -544,7 +571,9 @@
 
   x = xmlnode_get_tag(xmldata, "query");
   ns = xmlnode_get_attrib(x, "xmlns");
-  if (ns && !strcmp(ns, NS_VERSION)) {
+  if (ns && !strcmp(ns, NS_DISCO_INFO)) {
+    handle_iq_disco_info(conn, from, id, xmldata);
+  } else if (ns && !strcmp(ns, NS_VERSION)) {
     handle_iq_version(conn, from, id, xmldata);
   } else if (ns && !strcmp(ns, NS_TIME)) {
     handle_iq_time(conn, from, id, xmldata);