im.pidgin.cpw.resiak.disconnectreason: 688a896af7f228132e0f78057e7ed5812c3f7b13

[resiak at soc.pidgin.im]

revision:            688a896af7f228132e0f78057e7ed5812c3f7b13
date:                2007-09-18T16:32:01
author:              resiak at soc.pidgin.im
branch:              im.pidgin.cpw.resiak.disconnectreason
changelog:
Fix up Bonjour to use purple_connection_error_reason.

manifest:
format_version "1"

new_manifest [f2f5b09b24c7df68f092ca985f6b6ed3f801675c]

old_revision [04389226a6288dedc7867ed0ecabdd64350099b0]

patch "libpurple/protocols/bonjour/bonjour.c"
 from [4bf190ec74fffd44c858abfabab31e1cd8cbfa18]
   to [0fe107be6d5a18e1f4bab184cb3de4cde29f525d]

patch "libpurple/protocols/bonjour/jabber.c"
 from [ca14bd20d800332bae87d265e84c2af34ea6bb4e]
   to [d4b36cf3f7c90c235c82514771458f33523e3d6e]
-------------- next part --------------
#
#
# patch "libpurple/protocols/bonjour/bonjour.c"
#  from [4bf190ec74fffd44c858abfabab31e1cd8cbfa18]
#    to [0fe107be6d5a18e1f4bab184cb3de4cde29f525d]
# 
# patch "libpurple/protocols/bonjour/jabber.c"
#  from [ca14bd20d800332bae87d265e84c2af34ea6bb4e]
#    to [d4b36cf3f7c90c235c82514771458f33523e3d6e]
#
============================================================
--- libpurple/protocols/bonjour/bonjour.c	4bf190ec74fffd44c858abfabab31e1cd8cbfa18
+++ libpurple/protocols/bonjour/bonjour.c	0fe107be6d5a18e1f4bab184cb3de4cde29f525d
@@ -109,7 +109,8 @@ bonjour_login(PurpleAccount *account)
 
 	if (bonjour_jabber_start(bd->jabber_data) == -1) {
 		/* Send a message about the connection error */
-		purple_connection_error(gc, _("Unable to listen for incoming IM connections\n"));
+		purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR,
+			_("Unable to listen for incoming IM connections\n"));
 		return;
 	}
 
@@ -134,7 +135,8 @@ bonjour_login(PurpleAccount *account)
 	bd->dns_sd_data->account = account;
 	if (!bonjour_dns_sd_start(bd->dns_sd_data))
 	{
-		purple_connection_error(gc, _("Unable to establish connection with the local mDNS server.  Is it running?"));
+		purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR,
+			_("Unable to establish connection with the local mDNS server.  Is it running?"));
 		return;
 	}
 
============================================================
--- libpurple/protocols/bonjour/jabber.c	ca14bd20d800332bae87d265e84c2af34ea6bb4e
+++ libpurple/protocols/bonjour/jabber.c	d4b36cf3f7c90c235c82514771458f33523e3d6e
@@ -580,7 +580,8 @@ bonjour_jabber_start(BonjourJabber *data
 	if ((data->socket = socket(PF_INET, SOCK_STREAM, 0)) < 0)
 	{
 		purple_debug_error("bonjour", "Cannot open socket: %s\n", strerror(errno));
-		purple_connection_error(data->account->gc, _("Cannot open socket"));
+		purple_connection_error_reason (data->account->gc,
+			PURPLE_REASON_NETWORK_ERROR, _("Cannot open socket"));
 		return -1;
 	}
 
@@ -588,7 +589,8 @@ bonjour_jabber_start(BonjourJabber *data
 	if (setsockopt(data->socket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) != 0)
 	{
 		purple_debug_error("bonjour", "Error setting socket options: %s\n", strerror(errno));
-		purple_connection_error(data->account->gc, _("Error setting socket options"));
+		purple_connection_error_reason (data->account->gc,
+			PURPLE_REASON_NETWORK_ERROR, _("Error setting socket options"));
 		return -1;
 	}
 
@@ -612,7 +614,8 @@ bonjour_jabber_start(BonjourJabber *data
 	if (!bind_successful)
 	{
 		purple_debug_error("bonjour", "Cannot bind socket: %s\n", strerror(errno));
-		purple_connection_error(data->account->gc, _("Could not bind socket to port"));
+		purple_connection_error_reason (data->account->gc,
+			PURPLE_REASON_NETWORK_ERROR, _("Could not bind socket to port"));
 		return -1;
 	}
 
@@ -620,7 +623,8 @@ bonjour_jabber_start(BonjourJabber *data
 	if (listen(data->socket, 10) != 0)
 	{
 		purple_debug_error("bonjour", "Cannot listen on socket: %s\n", strerror(errno));
-		purple_connection_error(data->account->gc, _("Could not listen on socket"));
+		purple_connection_error_reason (data->account->gc,
+			PURPLE_REASON_NETWORK_ERROR, _("Could not listen on socket"));
 		return -1;
 	}