changeset 27086:f5222e5ae468

Don't support adding JID+node items.
author Paul Aurich <paul@darkrain42.org>
date Mon, 08 Jun 2009 06:52:57 +0000
parents fc7b9ca819c3
children 021fbf2df9f0 42c64c41cf87
files pidgin/plugins/disco/xmppdisco.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/disco/xmppdisco.c	Mon Jun 08 06:51:08 2009 +0000
+++ b/pidgin/plugins/disco/xmppdisco.c	Mon Jun 08 06:52:57 2009 +0000
@@ -294,7 +294,7 @@
 		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 @@
 		} 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;