# HG changeset patch
# User Richard Nelson <wabz@pidgin.im>
# Date 1186364716 0
# Node ID 6af9201ac685a1809a9fc1de71ff79a9e95a81ed
# Parent  9377e741f5b2f8bed334f77f940c18f739c950d7# Parent  f15bdcc44fc12b620c42440186e7f58cb4626455
merge of '1aae35116707aa4cbcce79a81347a39f37703677'
     and '5e6273d7c4443d0da4b207960e426a11b2448dcd'

diff -r f15bdcc44fc1 -r 6af9201ac685 configure.ac
--- a/configure.ac	Mon Aug 06 00:16:31 2007 +0000
+++ b/configure.ac	Mon Aug 06 01:45:16 2007 +0000
@@ -593,6 +593,46 @@
 AC_SUBST(MEANWHILE_LIBS)
 
 dnl #######################################################################
+dnl # Check for Native Avahi headers (for Bonjour)
+dnl #######################################################################
+AC_ARG_WITH(avahi-client-includes, [AC_HELP_STRING([--with-avahi-client-includes=DIR], [compile the Bonjour plugin against the Avahi Client includes in DIR])], [ac_avahi_client_includes="$withval"], [ac_avahi_client_includes="no"])
+AC_ARG_WITH(avahi-client-libs, [AC_HELP_STRING([--with-avahi-client-libs=DIR], [compile the Bonjour plugin against the Avahi Client libs in DIR])], [ac_avahi_client_libs="$withval"], [ac_avahi_client_libs="no"])
+AVAHI_CFLAGS=""
+AVAHI_LIBS=""
+
+dnl Attempt to autodetect Avahi
+PKG_CHECK_MODULES(AVAHI, [avahi-client avahi-glib], [
+	avahiincludes="yes"
+	avahilibs="yes"
+], [
+	AC_MSG_RESULT(no)
+	avahiincludes="no"
+	avahilibs="no"
+])
+
+dnl Override AVAHI_CFLAGS if the user specified an include dir
+if test "$ac_avahi_client_includes" != "no"; then
+	AVAHI_CFLAGS="-I$ac_avahi_client_includes"
+fi
+CPPFLAGS_save="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS"
+AC_CHECK_HEADER(avahi-client/client.h, [avahiincludes=yes], [avahiincludes=no])
+CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS $GLIB_CFLAGS"
+AC_CHECK_HEADER(avahi-glib/glib-malloc.h, [avahiincludes=yes], [avahiincludes=no])
+CPPFLAGS="$CPPFLAGS_save"
+
+dnl Override AVAHI_LIBS if the user specified a libs dir
+if test "$ac_avahi_client_libs" != "no"; then
+	AVAHI_LIBS="-L$ac_avahi_client_libs -lavahi-common -lavahi-client -lavahi-glib "
+fi
+AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
+
+AC_SUBST(AVAHI_CFLAGS)
+AC_SUBST(AVAHI_LIBS)
+
+AM_CONDITIONAL(MDNS_AVAHI, test "x$avahiincludes" = "xyes" -a "x$avahilibs" = "xyes")
+
+dnl #######################################################################
 dnl # Check for Howl headers (for Bonjour)
 dnl #######################################################################
 AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"])
@@ -601,6 +641,7 @@
 HOWL_LIBS=""
 
 dnl Attempt to autodetect avahi-compat-howl
+dnl TODO: (This should be removed when the native avahi stuff is stable)
 PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [
 	howlincludes="yes"
 	howllibs="yes"
@@ -640,6 +681,9 @@
 AC_SUBST(HOWL_CFLAGS)
 AC_SUBST(HOWL_LIBS)
 
+AM_CONDITIONAL(MDNS_HOWL, test "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes")
+
+
 dnl #######################################################################
 dnl # Check for SILC client includes and libraries
 dnl #######################################################################
@@ -819,8 +863,10 @@
 if test "x$have_meanwhile" != "xyes" ; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
 fi
-if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+	if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
+		STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+	fi
 fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'`
@@ -873,7 +919,7 @@
 		*)			echo "Invalid static protocol $i!!" ; exit ;;
 	esac
 done
-AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes" -a "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes")
+AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
@@ -898,8 +944,10 @@
 if test "x$have_meanwhile" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
 fi
-if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+	if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
+		DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+	fi
 fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'`
@@ -930,7 +978,7 @@
 		*)			echo "Invalid dynamic protocol $i!!" ; exit ;;
 	esac
 done
-AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a "x$bonjourincludes" = "xyes" -a "x$bonjourclient" = "xyes")
+AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes"  -a [ [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] -o [ "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes" ] ] )
 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes")
 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes")
 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes")
diff -r f15bdcc44fc1 -r 6af9201ac685 libpurple/protocols/bonjour/Makefile.am
--- a/libpurple/protocols/bonjour/Makefile.am	Mon Aug 06 00:16:31 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Mon Aug 06 01:45:16 2007 +0000
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
-		mdns_win32.c \
-		Makefile.mingw
+	mdns_win32.c \
+	dns_sd_proxy.h \
+	Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
@@ -9,18 +10,24 @@
 	bonjour.h \
 	buddy.c \
 	buddy.h \
-	dns_sd_proxy.h \
 	jabber.c \
 	jabber.h \
 	mdns_common.c \
 	mdns_common.h \
-	mdns_howl.c \
 	mdns_interface.h \
 	mdns_types.h \
 	parser.c \
 	parser.h
 
-AM_CFLAGS = $(st) -DUSE_BONJOUR_HOWL
+if MDNS_AVAHI
+  BONJOURSOURCES += mdns_avahi.c
+else
+  if MDNS_HOWL
+    BONJOURSOURCES += mdns_howl.c
+  endif
+endif
+
+AM_CFLAGS = $(st)
 
 libbonjour_la_LDFLAGS = -module -avoid-version
 
@@ -30,14 +37,29 @@
 noinst_LIBRARIES     = libbonjour.a
 libbonjour_a_SOURCES = $(BONJOURSOURCES)
 libbonjour_a_CFLAGS  = $(AM_CFLAGS)
-libbonjour_a_LIBADD  = $(HOWL_LIBS)
+libbonjour_a_LIBADD  =
+
+if MDNS_AVAHI
+  libbonjour_a_LIBADD  += $(AVAHI_LIBS)
+else
+  if MDNS_HOWL
+    libbonjour_a_LIBADD  += $(HOWL_LIBS)
+  endif
+endif
 
 else
 
 st =
 pkg_LTLIBRARIES       = libbonjour.la
 libbonjour_la_SOURCES = $(BONJOURSOURCES)
-libbonjour_la_LIBADD   = $(GLIB_LIBS) $(HOWL_LIBS) $(LIBXML_LIBS)
+libbonjour_la_LIBADD  = $(GLIB_LIBS) $(LIBXML_LIBS)
+if MDNS_AVAHI
+  libbonjour_la_LIBADD  += $(AVAHI_LIBS)
+else
+  if MDNS_HOWL
+    libbonjour_la_LIBADD  += $(HOWL_LIBS)
+  endif
+endif
 
 endif
 
@@ -47,5 +69,13 @@
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	$(HOWL_CFLAGS) \
 	$(LIBXML_CFLAGS)
+
+if MDNS_AVAHI
+  AM_CPPFLAGS += $(AVAHI_CFLAGS)
+else
+  if MDNS_HOWL
+    AM_CPPFLAGS += $(HOWL_CFLAGS)
+  endif
+endif
+
diff -r f15bdcc44fc1 -r 6af9201ac685 libpurple/protocols/bonjour/mdns_avahi.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/bonjour/mdns_avahi.c	Mon Aug 06 01:45:16 2007 +0000
@@ -0,0 +1,349 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "internal.h"
+
+#include "mdns_interface.h"
+#include "debug.h"
+#include "buddy.h"
+
+#include <avahi-client/client.h>
+#include <avahi-client/lookup.h>
+#include <avahi-client/publish.h>
+
+#include <avahi-common/address.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+#include <avahi-common/strlst.h>
+
+#include <avahi-glib/glib-malloc.h>
+#include <avahi-glib/glib-watch.h>
+
+/* data used by avahi bonjour implementation */
+typedef struct _avahi_session_impl_data {
+	AvahiClient *client;
+	AvahiGLibPoll *glib_poll;
+	AvahiServiceBrowser *sb;
+	AvahiEntryGroup *group;
+} AvahiSessionImplData;
+
+static void
+_resolver_callback(AvahiServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol,
+		  AvahiResolverEvent event, const char *name, const char *type, const char *domain,
+		  const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt,
+		  AvahiLookupResultFlags flags, void *userdata) {
+
+	BonjourBuddy *buddy;
+	PurpleAccount *account = userdata;
+	AvahiStringList *l;
+	size_t size;
+	char *key, *value;
+	int ret;
+
+	g_return_if_fail(r != NULL);
+
+	switch (event) {
+		case AVAHI_RESOLVER_FAILURE:
+			purple_debug_error("bonjour", "_resolve_callback - Failure: %s\n",
+				avahi_strerror(avahi_client_errno(avahi_service_resolver_get_client(r))));
+			break;
+		case AVAHI_RESOLVER_FOUND:
+			/* create a buddy record */
+			buddy = bonjour_buddy_new(name, account);
+
+			/* Get the ip as a string */
+			buddy->ip = g_malloc(AVAHI_ADDRESS_STR_MAX);
+			avahi_address_snprint(buddy->ip, AVAHI_ADDRESS_STR_MAX, a);
+
+			buddy->port_p2pj = port;
+
+			/* Obtain the parameters from the text_record */
+			l = txt;
+			while (l != NULL) {
+				ret = avahi_string_list_get_pair(l, &key, &value, &size);
+				l = l->next;
+				if (ret < 0)
+					continue;
+				set_bonjour_buddy_value(buddy, key, value, size);
+				/* TODO: Since we're using the glib allocator, I think we
+				 * can use the values instead of re-copying them */
+				avahi_free(key);
+				avahi_free(value);
+			}
+
+			if (!bonjour_buddy_check(buddy))
+				bonjour_buddy_delete(buddy);
+			else
+				/* Add or update the buddy in our buddy list */
+				bonjour_buddy_add_to_purple(buddy);
+
+			break;
+		default:
+			purple_debug_info("bonjour", "Unrecognized Service Resolver event: %d.\n", event);
+	}
+
+	avahi_service_resolver_free(r);
+}
+
+static void
+_browser_callback(AvahiServiceBrowser *b, AvahiIfIndex interface,
+		  AvahiProtocol protocol, AvahiBrowserEvent event,
+		  const char *name, const char *type, const char *domain,
+		  AvahiLookupResultFlags flags, void *userdata) {
+
+	PurpleAccount *account = userdata;
+	PurpleBuddy *gb = NULL;
+
+	switch (event) {
+		case AVAHI_BROWSER_FAILURE:
+			purple_debug_error("bonjour", "_browser_callback - Failure: %s\n",
+				avahi_strerror(avahi_client_errno(avahi_service_browser_get_client(b))));
+			/* TODO: This is an error that should be handled. */
+			break;
+		case AVAHI_BROWSER_NEW:
+			/* A new peer has joined the network and uses iChat bonjour */
+			purple_debug_info("bonjour", "_browser_callback - new service\n");
+			/* Make sure it isn't us */
+			if (g_ascii_strcasecmp(name, account->username) != 0) {
+				if (!avahi_service_resolver_new(avahi_service_browser_get_client(b),
+						interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC,
+						0, _resolver_callback, account)) {
+					purple_debug_warning("bonjour", "_browser_callback -- Error initiating resolver: %s\n",
+						avahi_strerror(avahi_client_errno(avahi_service_browser_get_client(b))));
+				}
+			}
+			break;
+		case AVAHI_BROWSER_REMOVE:
+			purple_debug_info("bonjour", "_browser_callback - Remove service\n");
+			gb = purple_find_buddy(account, name);
+			if (gb != NULL) {
+				bonjour_buddy_delete(gb->proto_data);
+				purple_blist_remove_buddy(gb);
+			}
+			break;
+		case AVAHI_BROWSER_ALL_FOR_NOW:
+		case AVAHI_BROWSER_CACHE_EXHAUSTED:
+			purple_debug_warning("bonjour", "(Browser) %s\n",
+				event == AVAHI_BROWSER_CACHE_EXHAUSTED ? "CACHE_EXHAUSTED" : "ALL_FOR_NOW");
+			break;
+		default:
+			purple_debug_info("bonjour", "Unrecognized Service browser event: %d.\n", event);
+	}
+}
+
+static void
+_entry_group_cb(AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) {
+	AvahiSessionImplData *idata = userdata;
+
+	g_return_if_fail(g == idata->group || idata->group == NULL);
+
+	switch(state) {
+		case AVAHI_ENTRY_GROUP_ESTABLISHED:
+			purple_debug_info("bonjour", "Successfully registered service.\n");
+			break;
+		case AVAHI_ENTRY_GROUP_COLLISION:
+			purple_debug_error("bonjour", "Collision registering entry group.\n");
+			/* TODO: Handle error - this should log out the account. (Possibly with "wants to die")*/
+			break;
+		case AVAHI_ENTRY_GROUP_FAILURE:
+			purple_debug_error("bonjour", "Error registering entry group: %s\n.",
+				avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
+			/* TODO: Handle error - this should log out the account.*/
+			break;
+		case AVAHI_ENTRY_GROUP_UNCOMMITED:
+		case AVAHI_ENTRY_GROUP_REGISTERING:
+			break;
+	}
+
+}
+
+/****************************
+ * mdns_interface functions *
+ ****************************/
+
+gboolean _mdns_init_session(BonjourDnsSd *data) {
+	AvahiSessionImplData *idata = g_new0(AvahiSessionImplData, 1);
+	const AvahiPoll *poll_api;
+	int error;
+
+	/* Tell avahi to use g_malloc and g_free */
+	avahi_set_allocator (avahi_glib_allocator ());
+
+	/* This currently depends on the glib mainloop,
+	 * we should make it use the libpurple abstraction */
+
+	idata->glib_poll = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT);
+
+	poll_api = avahi_glib_poll_get(idata->glib_poll);
+
+	idata->client = avahi_client_new(poll_api, 0, NULL, data, &error);
+
+	if (idata->client == NULL) {
+		purple_debug_error("bonjour", "Error initializing Avahi: %s", avahi_strerror(error));
+		avahi_glib_poll_free(idata->glib_poll);
+		g_free(idata);
+		return FALSE;
+	}
+
+	data->mdns_impl_data = idata;
+
+	return TRUE;
+}
+
+gboolean _mdns_publish(BonjourDnsSd *data, PublishType type) {
+	int publish_result = 0;
+	char portstring[6];
+	const char *jid, *aim, *email;
+	AvahiSessionImplData *idata = data->mdns_impl_data;
+	AvahiStringList *lst = NULL;
+
+	g_return_val_if_fail(idata != NULL, FALSE);
+
+	if (!idata->group) {
+		idata->group = avahi_entry_group_new(idata->client,
+						     _entry_group_cb, idata);
+		if (!idata->group) {
+			purple_debug_error("bonjour",
+				"Unable to initialize the data for the mDNS (%s).\n",
+				avahi_strerror(avahi_client_errno(idata->client)));
+			return FALSE;
+		}
+	}
+
+	/* Convert the port to a string */
+	snprintf(portstring, sizeof(portstring), "%d", data->port_p2pj);
+
+	jid = purple_account_get_string(data->account, "jid", NULL);
+	aim = purple_account_get_string(data->account, "AIM", NULL);
+	email = purple_account_get_string(data->account, "email", NULL);
+
+	/* We should try to follow XEP-0174, but some clients have "issues", so we humor them.
+	 * See http://telepathy.freedesktop.org/wiki/SalutInteroperability
+	 */
+
+	/* Needed by iChat */
+	lst = avahi_string_list_add_pair(lst,"txtvers", "1");
+	/* Needed by Gaim/Pidgin <= 2.0.1 (remove at some point) */
+	lst = avahi_string_list_add_pair(lst, "1st", data->first);
+	/* Needed by Gaim/Pidgin <= 2.0.1 (remove at some point) */
+	lst = avahi_string_list_add_pair(lst, "last", data->last);
+	/* Needed by Adium */
+	lst = avahi_string_list_add_pair(lst, "port.p2pj", portstring);
+	/* Needed by iChat, Gaim/Pidgin <= 2.0.1 */
+	lst = avahi_string_list_add_pair(lst, "status", data->status);
+	/* Currently always set to "!" since we don't support AV and wont ever be in a conference */
+	lst = avahi_string_list_add_pair(lst, "vc", data->vc);
+	lst = avahi_string_list_add_pair(lst, "ver", VERSION);
+	if (email != NULL && *email != '\0')
+		lst = avahi_string_list_add_pair(lst, "email", email);
+	if (jid != NULL && *jid != '\0')
+		lst = avahi_string_list_add_pair(lst, "jid", jid);
+	/* Nonstandard, but used by iChat */
+	if (aim != NULL && *aim != '\0')
+		lst = avahi_string_list_add_pair(lst, "AIM", aim);
+	if (data->msg != NULL && *data->msg != '\0')
+		lst = avahi_string_list_add_pair(lst, "msg", data->msg);
+	if (data->phsh != NULL && *data->phsh != '\0')
+		lst = avahi_string_list_add_pair(lst, "phsh", data->phsh);
+
+	/* TODO: ext, nick, node */
+
+
+	/* Publish the service */
+	switch (type) {
+		case PUBLISH_START:
+			publish_result = avahi_entry_group_add_service_strlst(
+				idata->group, AVAHI_IF_UNSPEC,
+				AVAHI_PROTO_UNSPEC, 0,
+				purple_account_get_username(data->account),
+				ICHAT_SERVICE, NULL, NULL, data->port_p2pj, lst);
+			break;
+		case PUBLISH_UPDATE:
+			publish_result = avahi_entry_group_update_service_txt_strlst(
+				idata->group, AVAHI_IF_UNSPEC,
+				AVAHI_PROTO_UNSPEC, 0,
+				purple_account_get_username(data->account),
+				ICHAT_SERVICE, NULL, lst);
+			break;
+	}
+
+	/* Free the memory used by temp data */
+	avahi_string_list_free(lst);
+
+	if (publish_result < 0) {
+		purple_debug_error("bonjour",
+			"Failed to add the " ICHAT_SERVICE " service. Error: %s\n",
+			avahi_strerror(publish_result));
+		return FALSE;
+	}
+
+	if ((publish_result = avahi_entry_group_commit(idata->group)) < 0) {
+		purple_debug_error("bonjour",
+			"Failed to commit " ICHAT_SERVICE " service. Error: %s\n",
+			avahi_strerror(publish_result));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+gboolean _mdns_browse(BonjourDnsSd *data) {
+	AvahiSessionImplData *idata = data->mdns_impl_data;
+
+	g_return_val_if_fail(idata != NULL, FALSE);
+
+	idata->sb = avahi_service_browser_new(idata->client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, ICHAT_SERVICE, NULL, 0, _browser_callback, data->account);
+	if (!idata->sb) {
+
+		purple_debug_error("bonjour",
+			"Unable to initialize service browser.  Error: %s\n.",
+			avahi_strerror(avahi_client_errno(idata->client)));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/* This is done differently than with Howl/Apple Bonjour */
+guint _mdns_register_to_mainloop(BonjourDnsSd *data) {
+	return 0;
+}
+
+void _mdns_stop(BonjourDnsSd *data) {
+	AvahiSessionImplData *idata = data->mdns_impl_data;
+
+	if (idata == NULL || idata->client == NULL)
+		return;
+
+	if (idata->sb != NULL)
+		avahi_service_browser_free(idata->sb);
+
+	avahi_client_free(idata->client);
+	avahi_glib_poll_free(idata->glib_poll);
+
+	g_free(idata);
+
+	data->mdns_impl_data = NULL;
+}
+
+void _mdns_init_buddy(BonjourBuddy *buddy) {
+}
+
+void _mdns_delete_buddy(BonjourBuddy *buddy) {
+}
+
+void bonjour_dns_sd_retrieve_buddy_icon(BonjourBuddy* buddy) {
+}
diff -r f15bdcc44fc1 -r 6af9201ac685 libpurple/protocols/bonjour/mdns_common.c
--- a/libpurple/protocols/bonjour/mdns_common.c	Mon Aug 06 00:16:31 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_common.c	Mon Aug 06 01:45:16 2007 +0000
@@ -111,5 +111,6 @@
 	_mdns_stop(data);
 
 	gc = purple_account_get_connection(data->account);
-	purple_input_remove(gc->inpa);
+	if (gc->inpa > 0)
+		purple_input_remove(gc->inpa);
 }
diff -r f15bdcc44fc1 -r 6af9201ac685 libpurple/protocols/bonjour/mdns_howl.c
--- a/libpurple/protocols/bonjour/mdns_howl.c	Mon Aug 06 00:16:31 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_howl.c	Mon Aug 06 01:45:16 2007 +0000
@@ -145,7 +145,7 @@
 			break;
 		case SW_DISCOVERY_BROWSE_REMOVE_SERVICE:
 			purple_debug_info("bonjour", "_browser_reply --> Remove service\n");
-			gb = purple_find_buddy((PurpleAccount*)extra, name);
+			gb = purple_find_buddy(account, name);
 			if (gb != NULL)
 			{
 				bonjour_buddy_delete(gb->proto_data);
@@ -258,14 +258,14 @@
 			break;
 	}
 
+	/* Free the memory used by temp data */
+	sw_text_record_fina(dns_data);
+
 	if (publish_result != SW_OKAY) {
-		purple_debug_error("bonjour", "Unable to publish or change the status of the _presence._tcp service.\n");
+		purple_debug_error("bonjour", "Unable to publish or change the status of the " ICHAT_SERVICE " service.\n");
 		return FALSE;
 	}
 
-	/* Free the memory used by temp data */
-	sw_text_record_fina(dns_data);
-
 	return TRUE;
 }
 
@@ -283,7 +283,7 @@
 guint _mdns_register_to_mainloop(BonjourDnsSd *data) {
 	HowlSessionImplData *idata = data->mdns_impl_data;
 
-	g_return_val_if_fail(idata != NULL, FALSE);
+	g_return_val_if_fail(idata != NULL, 0);
 
 	return purple_input_add(sw_discovery_socket(idata->session),
 				PURPLE_INPUT_READ, _mdns_handle_event, idata->session);
diff -r f15bdcc44fc1 -r 6af9201ac685 libpurple/protocols/bonjour/mdns_win32.c
--- a/libpurple/protocols/bonjour/mdns_win32.c	Mon Aug 06 00:16:31 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Mon Aug 06 01:45:16 2007 +0000
@@ -340,7 +340,7 @@
 guint _mdns_register_to_mainloop(BonjourDnsSd *data) {
 	Win32SessionImplData *idata = data->mdns_impl_data;
 
-	g_return_val_if_fail(idata != NULL, FALSE);
+	g_return_val_if_fail(idata != NULL, 0);
 
 	return purple_input_add(DNSServiceRefSockFD(idata->browser),
 				PURPLE_INPUT_READ, _mdns_handle_event, idata->browser);