im.pidgin.pidgin: 7595eff42168a97a13aec5a68f05916a862b22df

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 7595eff42168a97a13aec5a68f05916a862b22df
Ancestor: 2996670bdeb36ac63658ea4760a8a1f2e362e703
Author: datallah at pidgin.im
Date: 2007-11-30T21:29:18
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/bonjour/issues.txt
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/bonjour/mdns_avahi.c

ChangeLog: 

Don't advertise our presence in avahi on IPv6 or listen for sevices since we don't support receiving connections from or connecting to IPv6 buddies.  If someone needs to do that, they can submit a patch. Fixes #4188.

-------------- next part --------------
============================================================
--- libpurple/protocols/bonjour/issues.txt	5873164504cdae2f2e05435542b939b3d908d194
+++ libpurple/protocols/bonjour/issues.txt	64f4a0ee1bfdb31b61fd102da2ed7b779d85558e
@@ -1,6 +1,5 @@
 ==========================================
 ============= Known issues ===============
 ==========================================
 
-* File transfers
 * Typing notifications
============================================================
--- libpurple/protocols/bonjour/jabber.c	eb999768e0a1e74908b0e23168c9e56d334cf3de
+++ libpurple/protocols/bonjour/jabber.c	d5513158e2d3c0eef3c29dfebfeebee75f801672
@@ -620,7 +620,7 @@ bonjour_jabber_start(BonjourJabber *data
 	}
 
 	memset(&my_addr, 0, sizeof(struct sockaddr_in));
-	my_addr.sin_family = PF_INET;
+	my_addr.sin_family = AF_INET;
 
 	/* Attempt to find a free port */
 	bind_successful = FALSE;
============================================================
--- libpurple/protocols/bonjour/mdns_avahi.c	5cd991c2ee38f86b764210de978cbc1f48c8a796
+++ libpurple/protocols/bonjour/mdns_avahi.c	03c3c9bf354d71b0c4f82b07d072e2256f7f43e9
@@ -155,7 +155,7 @@ _browser_callback(AvahiServiceBrowser *b
 			/* Make sure it isn't us */
 			if (purple_utf8_strcasecmp(name, account->username) != 0) {
 				if (!avahi_service_resolver_new(avahi_service_browser_get_client(b),
-						interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC,
+						interface, protocol, name, type, domain, AVAHI_PROTO_INET,
 						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))));
@@ -315,14 +315,14 @@ gboolean _mdns_publish(BonjourDnsSd *dat
 		case PUBLISH_START:
 			publish_result = avahi_entry_group_add_service_strlst(
 				idata->group, AVAHI_IF_UNSPEC,
-				AVAHI_PROTO_UNSPEC, 0,
+				AVAHI_PROTO_INET, 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,
+				AVAHI_PROTO_INET, 0,
 				purple_account_get_username(data->account),
 				ICHAT_SERVICE, NULL, lst);
 			break;
@@ -354,7 +354,7 @@ gboolean _mdns_browse(BonjourDnsSd *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);
+	idata->sb = avahi_service_browser_new(idata->client, AVAHI_IF_UNSPEC, AVAHI_PROTO_INET, ICHAT_SERVICE, NULL, 0, _browser_callback, data->account);
 	if (!idata->sb) {
 
 		purple_debug_error("bonjour",
@@ -400,7 +400,7 @@ gboolean _mdns_set_buddy_icon_data(Bonjo
 				purple_account_get_username(data->account));
 
 		ret = avahi_entry_group_add_record(idata->buddy_icon_group, AVAHI_IF_UNSPEC,
-			AVAHI_PROTO_UNSPEC, flags, svc_name,
+			AVAHI_PROTO_INET, flags, svc_name,
 			AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 120, avatar_data, avatar_len);
 
 		g_free(svc_name);
@@ -486,7 +486,7 @@ void _mdns_retrieve_buddy_icon(BonjourBu
 
 	name = g_strdup_printf("%s." ICHAT_SERVICE "local", buddy->name);
 	idata->buddy_icon_rec_browser = avahi_record_browser_new(session_idata->client, AVAHI_IF_UNSPEC,
-		AVAHI_PROTO_UNSPEC, name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 0,
+		AVAHI_PROTO_INET, name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_NULL, 0,
 		_buddy_icon_record_cb, buddy);
 	g_free(name);