Mercurial > pidgin.yaz
comparison pidgin/plugins/disco/xmppdisco.c @ 27168:f5222e5ae468
Don't support adding JID+node items.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 08 Jun 2009 06:52:57 +0000 |
| parents | abab554140b5 |
| children | 4c55aa5aab82 |
comparison
equal
deleted
inserted
replaced
| 27167:fc7b9ca819c3 | 27168:f5222e5ae468 |
|---|---|
| 292 | 292 |
| 293 service = g_new0(XmppDiscoService, 1); | 293 service = g_new0(XmppDiscoService, 1); |
| 294 service->list = item_data->list; | 294 service->list = item_data->list; |
| 295 purple_debug_info("xmppdisco", "parent for %s is %p\n", from, item_data->parent); | 295 purple_debug_info("xmppdisco", "parent for %s is %p\n", from, item_data->parent); |
| 296 service->parent = item_data->parent; | 296 service->parent = item_data->parent; |
| 297 service->flags = XMPP_DISCO_ADD; | 297 service->flags = 0; |
| 298 service->type = disco_service_type_from_identity(identity); | 298 service->type = disco_service_type_from_identity(identity); |
| 299 | 299 |
| 300 if (item_data->node) { | 300 if (item_data->node) { |
| 301 if (item_data->name) { | 301 if (item_data->name) { |
| 302 service->name = item_data->name; | 302 service->name = item_data->name; |
| 309 | 309 |
| 310 if (service->type == XMPP_DISCO_SERVICE_TYPE_PUBSUB_COLLECTION) | 310 if (service->type == XMPP_DISCO_SERVICE_TYPE_PUBSUB_COLLECTION) |
| 311 service->flags |= XMPP_DISCO_BROWSE; | 311 service->flags |= XMPP_DISCO_BROWSE; |
| 312 } else | 312 } else |
| 313 service->name = g_strdup(from); | 313 service->name = g_strdup(from); |
| 314 | |
| 315 if (!service->node) | |
| 316 /* Only support adding JIDs, not JID+node combos */ | |
| 317 service->flags |= XMPP_DISCO_ADD; | |
| 314 | 318 |
| 315 if (item_data->name) { | 319 if (item_data->name) { |
| 316 service->description = item_data->name; | 320 service->description = item_data->name; |
| 317 item_data->name = NULL; | 321 item_data->name = NULL; |
| 318 } else if (identity) | 322 } else if (identity) |