# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1256426131 -7200
# Node ID 3b3b5c1f83274dbda64edb06dc066764c7bf1b38
# Parent  e38300775548e8c248d8802a8632e332956107f1# Parent  5f35d3573fe040d739ef1309ce8b7dc5d6bac4b5
Merge main and crew

diff -r 5f35d3573fe0 -r 3b3b5c1f8327 mcabber/src/xmpp_iq.c
--- a/mcabber/src/xmpp_iq.c	Sat Oct 24 21:43:34 2009 +0200
+++ b/mcabber/src/xmpp_iq.c	Sun Oct 25 01:15:31 2009 +0200
@@ -526,6 +526,9 @@
   const char *node = NULL;
   const char *param = NULL;
 
+  if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_RESULT)
+    return LM_HANDLER_RESULT_REMOVE_MESSAGE;
+
   r = lm_message_new_iq_from_query(m, LM_MESSAGE_SUB_TYPE_RESULT);
   query = lm_message_node_add_child(r->node, "query", NULL);
   lm_message_node_set_attribute(query, "xmlns", NS_DISCO_INFO);