comparison libpurple/protocols/bonjour/mdns_win32.c @ 32672:3828a61c44da

A boring and large patch so I can merge heads.

32671:0e69949b3e61

	DNSServiceRefDeallocate(args->resolver_query->sdRef);
	g_free(args->resolver_query);
	args->resolver_query = NULL;

	if ((pb = purple_find_buddy(args->account, args->res_data->name))) {
		if (pb->proto_data != args->bb) {
			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record.",
				args->res_data->name);
			goto cleanup;
		}
	/* Make sure that the BonjourBuddy associated with this request is still around */

				Win32SvcResolverData *rd;
				Win32BuddyImplData *idata;

				/* Is there an existing buddy? */
				if ((pb = purple_find_buddy(account, serviceName)))
					bb = pb->proto_data;
				/* Is there a pending buddy? */
				else {
					while (tmp) {
						BonjourBuddy *bb_tmp = tmp->data;
						if (!strcmp(bb_tmp->name, serviceName)) {

					/* This is only necessary for the wacky case where someone previously manually added a buddy. */
					if (pb == NULL)
						pending_buddies = g_slist_prepend(pending_buddies, bb);
					else
						pb->proto_data = bb;
				}

				rd = g_new0(Win32SvcResolverData, 1);
				rd->if_idx = interfaceIndex;
				rd->name = g_strdup(serviceName);

		pb = purple_find_buddy(account, serviceName);
		if (pb != NULL) {
			GSList *l;
			/* There may be multiple presences, we should only get rid of this one */
			Win32SvcResolverData *rd_search;
			BonjourBuddy *bb = pb->proto_data;
			Win32BuddyImplData *idata;

			g_return_if_fail(bb != NULL);

			idata = bb->mdns_impl_data;

32672:3828a61c44da

	DNSServiceRefDeallocate(args->resolver_query->sdRef);
	g_free(args->resolver_query);
	args->resolver_query = NULL;

	if ((pb = purple_find_buddy(args->account, args->res_data->name))) {
		if (purple_buddy_get_protocol_data(pb) != args->bb) {
			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record.",
				args->res_data->name);
			goto cleanup;
		}
	/* Make sure that the BonjourBuddy associated with this request is still around */

				Win32SvcResolverData *rd;
				Win32BuddyImplData *idata;

				/* Is there an existing buddy? */
				if ((pb = purple_find_buddy(account, serviceName)))
					bb = purple_buddy_get_protocol_data(pb);
				/* Is there a pending buddy? */
				else {
					while (tmp) {
						BonjourBuddy *bb_tmp = tmp->data;
						if (!strcmp(bb_tmp->name, serviceName)) {

					/* This is only necessary for the wacky case where someone previously manually added a buddy. */
					if (pb == NULL)
						pending_buddies = g_slist_prepend(pending_buddies, bb);
					else
						purple_buddy_set_protocol_data(pb, bb);
				}

				rd = g_new0(Win32SvcResolverData, 1);
				rd->if_idx = interfaceIndex;
				rd->name = g_strdup(serviceName);

		pb = purple_find_buddy(account, serviceName);
		if (pb != NULL) {
			GSList *l;
			/* There may be multiple presences, we should only get rid of this one */
			Win32SvcResolverData *rd_search;
			BonjourBuddy *bb = purple_buddy_get_protocol_data(pb);
			Win32BuddyImplData *idata;

			g_return_if_fail(bb != NULL);

			idata = bb->mdns_impl_data;