pidgin3: comparison libpurple/protocols/jabber/disco.c

-:f1ff4c059496
+:6cb5053eb433
 	feature = xmlnode_new_child(query, "feature"); \
 	xmlnode_set_attrib(feature, "var", x); \
 }
 struct jabber_disco_list_data {
-	JabberStream *js;
+	JabberStream *js; /* TODO: Needed? */
 	PurpleDiscoList *list;
 	char *server;
 	int fetch_count;
+};
+struct jabber_disco_service_data {
+	char *jid;
+	char *node;
 };
 static void
 jabber_disco_bytestream_server_cb(JabberStream *js, const char *from,
 JabberIqType type, const char *id,
 	PurpleDiscoList *list;
 	PurpleDiscoService *parent, *service;
 	PurpleDiscoServiceType service_type;
 	PurpleDiscoServiceFlags flags;
+	struct jabber_disco_service_data *service_data;
 	disco_data = data;
 	list_data = disco_data->list_data;
 	list = list_data->list;
 	parent = disco_data->parent;
 	disco_data->node = NULL;
 	g_free(disco_data);
 	--list_data->fetch_count;
-	if (list_data->list == NULL) {
+	if (!purple_disco_list_get_in_progress(list)) {
-		if (list_data->fetch_count == 0)
+		purple_disco_list_unref(list);
-			jabber_disco_list_data_destroy(list_data);
 		return;
 	}
 	if (!from || type == JABBER_IQ_ERROR
 			|| (!(query = xmlnode_get_child(packet, "query")))
 	if ((anode = xmlnode_get_attrib(query, "node")))
 		aname = g_strdup_printf("%s%s", from, anode);
 	else
 		aname = g_strdup(from);
+	service_data = g_new0(struct jabber_disco_service_data, 1);
+	service_data->jid = g_strdup(from);
+	if (anode)
+		service_data->node = g_strdup(anode);
 	service = purple_disco_list_service_new(service_type, aname,
-			xmlnode_get_attrib(identity, "name"), flags);
+			xmlnode_get_attrib(identity, "name"), flags, service_data);
 	g_free(aname);
 	if (service_type == PURPLE_DISCO_SERVICE_TYPE_GATEWAY)
 		purple_disco_service_set_gateway_type(service,
 				jabber_disco_type_from_string(xmlnode_get_attrib(identity,
 				                                                 "type")));
 	purple_disco_list_service_add(list, service, parent);
-	/* if (flags & PURPLE_DISCO_FLAG_BROWSE) - not all browsable services have this feature */
-	{
-		++list_data->fetch_count;
-		purple_disco_list_ref(list);
-		disco_data = g_new0(struct _disco_data, 1);
-		disco_data->list_data = list_data;
-		disco_data->parent = service;
-		jabber_disco_items_do(js, from, node, jabber_disco_service_items_cb,
-		                      disco_data);
-	}
 	if (list_data->fetch_count == 0)
 		purple_disco_list_set_in_progress(list, FALSE);
 	purple_disco_list_unref(list);
-	g_free(aname);
 	g_free(node);
 }
 static void
 jabber_disco_server_items_cb(JabberStream *js, const char *from,
 {
 	struct jabber_disco_list_data *list_data;
 	xmlnode *query, *child;
 	gboolean has_items = FALSE;
-	if (!from || type == JABBER_IQ_ERROR)
-		return;
 	list_data = data;
 	--list_data->fetch_count;
-	if (list_data->list == NULL) {
+	if (!from || type == JABBER_IQ_ERROR ||
-		if (list_data->fetch_count == 0)
+			!purple_disco_list_get_in_progress(list_data->list)) {
-			jabber_disco_list_data_destroy(list_data);
+		purple_disco_list_unref(list_data->list);
 		return;
 	}
 	query = xmlnode_get_child(packet, "query");
 	++list_data->fetch_count;
 	jabber_disco_info_do(js, list_data->server, jabber_disco_server_info_cb, list_data);
 }
 static void
+jabber_disco_service_close(PurpleDiscoService *service)
+{
+	struct jabber_disco_service_data *data;
+	data = purple_disco_service_get_protocol_data(service);
+	g_free(data->jid);
+	g_free(data->node);
+	g_free(data);
+}
+#if 0
+static void
 jabber_disco_cancel(PurpleDiscoList *list)
 {
-	struct jabber_disco_list_data *list_data = purple_disco_list_get_protocol_data(list);
+	/* This space intentionally letft blank */
-	purple_disco_list_set_protocol_data(list, NULL, NULL);
+}
+#endif
-	if (list_data->fetch_count == 0) {
-		/* Nothing outstanding, just free it now... */
+static void
-		jabber_disco_list_data_destroy(list_data);
+jabber_disco_list_expand(PurpleDiscoList *list, PurpleDiscoService *service)
-	} else {
+{
-		int i;
+	PurpleAccount *account;
-		/* Lose all our references to the PurpleDiscoList */
+	PurpleConnection *pc;
-		for (i = 0; i < list_data->fetch_count; ++i) {
+	JabberStream *js;
-			purple_disco_list_unref(list);
+	struct jabber_disco_list_data *list_data;
-		}
+	struct jabber_disco_service_data *service_data;
+	struct _disco_data *disco_data;
-		/* We'll free list_data when fetch_count is down to 0 */
-		list_data->list = NULL;
+	account = purple_disco_list_get_account(list);
-	}
+	pc = purple_account_get_connection(account);
+	js = purple_connection_get_protocol_data(pc);
+	list_data = purple_disco_list_get_protocol_data(list);
+	++list_data->fetch_count;
+	purple_disco_list_ref(list);
+	disco_data = g_new0(struct _disco_data, 1);
+	disco_data->list_data = list_data;
+	disco_data->parent = service;
+	service_data = purple_disco_service_get_protocol_data(service);
+	jabber_disco_items_do(js, service_data->jid, service_data->node,
+	                      jabber_disco_service_items_cb, disco_data);
 }
 static void
 jabber_disco_service_register(PurpleConnection *gc, PurpleDiscoService *service)
 {
 	list = purple_disco_list_new(account);
 	disco_list_data = g_new0(struct jabber_disco_list_data, 1);
 	disco_list_data->list = list;
 	disco_list_data->js = js;
-	purple_disco_list_set_protocol_data(list, disco_list_data, disco_proto_data_destroy_cb);
+	purple_disco_list_set_protocol_data(list, disco_list_data,
+	                                    disco_proto_data_destroy_cb);
+	purple_disco_list_set_service_close_func(list, jabber_disco_service_close);
+#if 0
 	purple_disco_list_set_cancel_func(list, jabber_disco_cancel);
+#endif
+	purple_disco_list_set_expand_func(list, jabber_disco_list_expand);
 	purple_disco_list_set_register_func(list, jabber_disco_service_register);
 	purple_request_input(gc, _("Server name request"), _("Enter an XMPP Server"),
 			_("Select an XMPP server to query"),
 			js->last_disco_server ? js->last_disco_server : js->user->domain,

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/jabber/disco.c

libpurple/protocols/jabber/disco.c