pidgin: 46523386: Don't support adding JID+node items.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 46523386d682c917679b3de662d51a5bda0da46b
Ancestor: 3a5923631e4f2d495b84625dbe1d49ab8b853ba2
Author: darkrain42 at pidgin.im
Date: 2009-06-08T06:52:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/46523386d682c917679b3de662d51a5bda0da46b

Modified files:
        pidgin/plugins/disco/xmppdisco.c

ChangeLog: 

Don't support adding JID+node items.

-------------- next part --------------
============================================================
--- pidgin/plugins/disco/xmppdisco.c	f21ae1ad342a414e123678644e6e9252088daaa6
+++ pidgin/plugins/disco/xmppdisco.c	bb3825cb49013ce5c45e60fafdf95fb765bb5596
@@ -294,7 +294,7 @@ got_info_cb(PurpleConnection *pc, const 
 		service->list = item_data->list;
 		purple_debug_info("xmppdisco", "parent for %s is %p\n", from, item_data->parent);
 		service->parent = item_data->parent;
-		service->flags = XMPP_DISCO_ADD;
+		service->flags = 0;
 		service->type = disco_service_type_from_identity(identity);
 
 		if (item_data->node) {
@@ -312,6 +312,10 @@ got_info_cb(PurpleConnection *pc, const 
 		} else
 			service->name = g_strdup(from);
 
+		if (!service->node)
+			/* Only support adding JIDs, not JID+node combos */
+			service->flags |= XMPP_DISCO_ADD;
+
 		if (item_data->name) {
 			service->description = item_data->name;
 			item_data->name = NULL;