comparison libpurple/protocols/bonjour/mdns_win32.c @ 25589:71aafff24358

Backport ab47b66449b213d6fbfc728cc1e8c161bed87755 (#8782 - Fix persistent Bonjour buddies.)

25588:21a90a4c76d6

	ResolveCallbackArgs *args = (ResolveCallbackArgs*) data;
	Win32BuddyImplData *idata = args->bb->mdns_impl_data;
	gboolean delete_buddy = FALSE;
	PurpleBuddy *pb = NULL;

	/* Make sure that the BonjourBuddy associated with this request is still around */
	if (g_slist_find(pending_buddies, args->bb) == NULL)
		goto cleanup;

	if ((pb = purple_find_buddy(args->account, args->bb->name)))
		if (pb->proto_data != args->bb)
			purple_debug_error("bonjour", "Found purple buddy for %s not matching bonjour buddy record. "
				"This is going to be ugly!.\n", args->bb->name);

	if (!hosts || !hosts->data) {
		purple_debug_error("bonjour", "host resolution - callback error.\n");
		delete_buddy = TRUE;
	} else {

25589:71aafff24358

	ResolveCallbackArgs *args = (ResolveCallbackArgs*) data;
	Win32BuddyImplData *idata = args->bb->mdns_impl_data;
	gboolean delete_buddy = FALSE;
	PurpleBuddy *pb = 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 */
	} else if (g_slist_find(pending_buddies, args->bb) == NULL) {
		purple_debug_error("bonjour", "host resolution - complete, but buddy no longer pending.\n");
		goto cleanup;
	}

	if (!hosts || !hosts->data) {
		purple_debug_error("bonjour", "host resolution - callback error.\n");
		delete_buddy = TRUE;
	} else {