Mercurial > pidgin
comparison libpurple/protocols/bonjour/bonjour.c @ 27590:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 05:43:38 +0000 |
parents | 97947f51b221 |
children | 8aebd0e204e5 |
comparison
equal
deleted
inserted
replaced
27104:048bcf41deef | 27590:a08e84032814 |
---|---|
87 PurplePresence *presence; | 87 PurplePresence *presence; |
88 | 88 |
89 #ifdef _WIN32 | 89 #ifdef _WIN32 |
90 if (!dns_sd_available()) { | 90 if (!dns_sd_available()) { |
91 purple_connection_error_reason(gc, | 91 purple_connection_error_reason(gc, |
92 PURPLE_CONNECTION_ERROR_OTHER_ERROR, | 92 PURPLE_CONNECTION_ERROR_OTHER_ERROR, |
93 _("The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: " | 93 _("Unable to find Apple's \"Bonjour for Windows\" toolkit, see " |
94 "http://d.pidgin.im/BonjourWindows" | 94 "http://d.pidgin.im/BonjourWindows for more information.")); |
95 " for more information.")); | |
96 return; | 95 return; |
97 } | 96 } |
98 #endif | 97 #endif /* _WIN32 */ |
99 | 98 |
100 gc->flags |= PURPLE_CONNECTION_HTML; | 99 gc->flags |= PURPLE_CONNECTION_HTML; |
101 gc->proto_data = bd = g_new0(BonjourData, 1); | 100 gc->proto_data = bd = g_new0(BonjourData, 1); |
102 | 101 |
103 /* Start waiting for jabber connections (iChat style) */ | 102 /* Start waiting for jabber connections (iChat style) */ |
106 bd->jabber_data->account = account; | 105 bd->jabber_data->account = account; |
107 | 106 |
108 if (bonjour_jabber_start(bd->jabber_data) == -1) { | 107 if (bonjour_jabber_start(bd->jabber_data) == -1) { |
109 /* Send a message about the connection error */ | 108 /* Send a message about the connection error */ |
110 purple_connection_error_reason (gc, | 109 purple_connection_error_reason (gc, |
111 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, | 110 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
112 _("Unable to listen for incoming IM connections\n")); | 111 _("Unable to listen for incoming IM connections")); |
113 return; | 112 return; |
114 } | 113 } |
115 | 114 |
116 /* Connect to the mDNS daemon looking for buddies in the LAN */ | 115 /* Connect to the mDNS daemon looking for buddies in the LAN */ |
117 bd->dns_sd_data = bonjour_dns_sd_new(); | 116 bd->dns_sd_data = bonjour_dns_sd_new(); |