# 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 e38300775548 -r 3b3b5c1f8327 mcabber/src/xmpp.c
--- a/mcabber/src/xmpp.c	Sun Oct 25 00:44:14 2009 +0200
+++ b/mcabber/src/xmpp.c	Sun Oct 25 01:15:31 2009 +0200
@@ -1244,13 +1244,13 @@
 {
   char *ver = user_data;
 
+  caps_add(ver);
   if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_ERROR) {
     display_server_error(lm_message_node_get_child(m->node, "error"));
   } else if (lm_message_get_sub_type(m) == LM_MESSAGE_SUB_TYPE_RESULT) {
     LmMessageNode *info;
     LmMessageNode *query = lm_message_node_get_child(m->node, "query");
 
-    caps_add(ver);
     info = lm_message_node_get_child(query, "identity");
     if (info)
       caps_set_identity(ver, lm_message_node_get_attribute(info, "category"),