# HG changeset patch # User Paul Aurich # Date 1244443977 0 # Node ID f5222e5ae4686ecbfc74ec3e24db644127abe135 # Parent fc7b9ca819c3ec5747b767d67c681556f4ea5bb0 Don't support adding JID+node items. diff -r fc7b9ca819c3 -r f5222e5ae468 pidgin/plugins/disco/xmppdisco.c --- 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;