comparison libpurple/protocols/bonjour/bonjour.c @ 20776:f3cfcbbac3d8

propagate from branch 'im.pidgin.pidgin' (head 294731552d0baf5f1f37a45e0c119b2188f34ba8) to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 548e06334e7772c9583776ecbd80e8d2a68fcd79)
author Will Thompson <will.thompson@collabora.co.uk>
date Fri, 05 Oct 2007 15:50:17 +0000
parents fb70e89180a9 efadfc6e2117
children c40416c4eca6
comparison
equal deleted inserted replaced
20775:d3443cb6a60f 20776:f3cfcbbac3d8
119 bd->jabber_data->port = BONJOUR_DEFAULT_PORT_INT; 119 bd->jabber_data->port = BONJOUR_DEFAULT_PORT_INT;
120 bd->jabber_data->account = account; 120 bd->jabber_data->account = account;
121 121
122 if (bonjour_jabber_start(bd->jabber_data) == -1) { 122 if (bonjour_jabber_start(bd->jabber_data) == -1) {
123 /* Send a message about the connection error */ 123 /* Send a message about the connection error */
124 purple_connection_error(gc, _("Unable to listen for incoming IM connections\n")); 124 purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR,
125 _("Unable to listen for incoming IM connections\n"));
125 return; 126 return;
126 } 127 }
127 128
128 /* Connect to the mDNS daemon looking for buddies in the LAN */ 129 /* Connect to the mDNS daemon looking for buddies in the LAN */
129 bd->dns_sd_data = bonjour_dns_sd_new(); 130 bd->dns_sd_data = bonjour_dns_sd_new();
144 bd->dns_sd_data->msg = g_strdup(purple_status_get_attr_string(status, "message")); 145 bd->dns_sd_data->msg = g_strdup(purple_status_get_attr_string(status, "message"));
145 146
146 bd->dns_sd_data->account = account; 147 bd->dns_sd_data->account = account;
147 if (!bonjour_dns_sd_start(bd->dns_sd_data)) 148 if (!bonjour_dns_sd_start(bd->dns_sd_data))
148 { 149 {
149 purple_connection_error(gc, _("Unable to establish connection with the local mDNS server. Is it running?")); 150 purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR,
151 _("Unable to establish connection with the local mDNS server. Is it running?"));
150 return; 152 return;
151 } 153 }
152 154
153 bonjour_dns_sd_update_buddy_icon(bd->dns_sd_data); 155 bonjour_dns_sd_update_buddy_icon(bd->dns_sd_data);
154 156