Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/bonjour/bonjour.c Sun Jul 12 05:42:40 2009 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Sun Jul 12 05:43:38 2009 +0000 @@ -89,13 +89,12 @@ #ifdef _WIN32 if (!dns_sd_available()) { purple_connection_error_reason(gc, - PURPLE_CONNECTION_ERROR_OTHER_ERROR, - _("The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: " - "http://d.pidgin.im/BonjourWindows" - " for more information.")); + PURPLE_CONNECTION_ERROR_OTHER_ERROR, + _("Unable to find Apple's \"Bonjour for Windows\" toolkit, see " + "http://d.pidgin.im/BonjourWindows for more information.")); return; } -#endif +#endif /* _WIN32 */ gc->flags |= PURPLE_CONNECTION_HTML; gc->proto_data = bd = g_new0(BonjourData, 1); @@ -108,8 +107,8 @@ if (bonjour_jabber_start(bd->jabber_data) == -1) { /* Send a message about the connection error */ purple_connection_error_reason (gc, - PURPLE_CONNECTION_ERROR_NETWORK_ERROR, - _("Unable to listen for incoming IM connections\n")); + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, + _("Unable to listen for incoming IM connections")); return; }