Mercurial > pidgin
diff libpurple/proxy.c @ 27590:a08e84032814
merge of '2348ff22f0ff3453774b8b25b36238465580c609'
and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 12 Jul 2009 05:43:38 +0000 |
parents | f541583e31bd |
children | 3712ef8bf231 |
line wrap: on
line diff
--- a/libpurple/proxy.c Sun Jul 12 05:42:40 2009 +0000 +++ b/libpurple/proxy.c Sun Jul 12 05:43:38 2009 +0000 @@ -403,7 +403,7 @@ MyWinHttpGetIEProxyConfig = (LPFNWINHTTPGETIEPROXYCONFIG) wpurple_find_and_loadproc("winhttp.dll", "WinHttpGetIEProxyConfigForCurrentUser"); if (!MyWinHttpGetIEProxyConfig) - purple_debug_info("proxy", "Unable to read Windows Proxy Settings.\n"); + purple_debug_warning("proxy", "Unable to read Windows Proxy Settings.\n"); } if (!MyWinHttpGetIEProxyConfig) @@ -572,7 +572,7 @@ if (error_message != NULL) { - purple_debug_info("proxy", "Connection attempt failed: %s\n", + purple_debug_error("proxy", "Connection attempt failed: %s\n", error_message); if (connect_data->hosts != NULL) try_connect(connect_data); @@ -658,7 +658,7 @@ if (ret != 0 || error != 0) { if (ret != 0) error = errno; - purple_debug_info("proxy", "Error connecting to %s:%d (%s).\n", + purple_debug_error("proxy", "Error connecting to %s:%d (%s).\n", connect_data->host, connect_data->port, g_strerror(error)); purple_proxy_connect_data_disconnect(connect_data, g_strerror(error)); @@ -688,7 +688,7 @@ if (connect_data->fd < 0) { purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Unable to create socket:\n%s"), g_strerror(errno)); + _("Unable to create socket: %s"), g_strerror(errno)); return; } @@ -750,7 +750,7 @@ if (connect_data->fd < 0) { purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Unable to create socket:\n%s"), g_strerror(errno)); + _("Unable to create socket: %s"), g_strerror(errno)); return; } @@ -871,7 +871,7 @@ if (len == 0) { purple_proxy_connect_data_disconnect(connect_data, - _("Server closed the connection.")); + _("Server closed the connection")); return; } @@ -882,7 +882,7 @@ /* Error! */ purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Lost connection with server:\n%s"), g_strerror(errno)); + _("Lost connection with server: %s"), g_strerror(errno)); return; } @@ -945,7 +945,7 @@ if (error) { purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Unable to parse response from HTTP proxy: %s\n"), + _("Unable to parse response from HTTP proxy: %s"), connect_data->read_buffer); return; } @@ -1065,7 +1065,7 @@ if (status == 403) { /* Forbidden */ purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Access denied: HTTP proxy server forbids port %d tunneling."), + _("Access denied: HTTP proxy server forbids port %d tunneling"), connect_data->port); } else { purple_proxy_connect_data_disconnect_formatted(connect_data, @@ -1191,7 +1191,7 @@ if (connect_data->fd < 0) { purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Unable to create socket:\n%s"), g_strerror(errno)); + _("Unable to create socket: %s"), g_strerror(errno)); return; } @@ -1384,7 +1384,7 @@ if (connect_data->fd < 0) { purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Unable to create socket:\n%s"), g_strerror(errno)); + _("Unable to create socket: %s"), g_strerror(errno)); return; } @@ -1453,7 +1453,7 @@ if (len == 0) { purple_proxy_connect_data_disconnect(connect_data, - _("Server closed the connection.")); + _("Server closed the connection")); return; } @@ -1465,7 +1465,7 @@ /* Error! */ purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Lost connection with server:\n%s"), g_strerror(errno)); + _("Lost connection with server: %s"), g_strerror(errno)); return; } @@ -1482,7 +1482,7 @@ } else { purple_debug_error("socks5 proxy", "Bad data.\n"); purple_proxy_connect_data_disconnect(connect_data, - _("Received invalid data on connection with server.")); + _("Received invalid data on connection with server")); } return; } @@ -1512,7 +1512,7 @@ default: purple_debug_error("socks5 proxy", "Invalid ATYP received (0x%X)\n", buf[3]); purple_proxy_connect_data_disconnect(connect_data, - _("Received invalid data on connection with server.")); + _("Received invalid data on connection with server")); return; } @@ -1567,7 +1567,7 @@ if (len == 0) { purple_proxy_connect_data_disconnect(connect_data, - _("Server closed the connection.")); + _("Server closed the connection")); return; } @@ -1579,7 +1579,7 @@ /* Error! */ purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Lost connection with server:\n%s"), g_strerror(errno)); + _("Lost connection with server: %s"), g_strerror(errno)); return; } @@ -1592,7 +1592,7 @@ if ((connect_data->read_buffer[0] != 0x01) || (connect_data->read_buffer[1] != 0x00)) { purple_proxy_connect_data_disconnect(connect_data, - _("Received invalid data on connection with server.")); + _("Received invalid data on connection with server")); return; } @@ -1663,7 +1663,7 @@ if (*cmdbuf != 0x01) { purple_proxy_connect_data_disconnect(connect_data, - _("Received invalid data on connection with server.")); + _("Received invalid data on connection with server")); return -1; } cmdbuf++; @@ -1764,7 +1764,7 @@ "of the socks5 CHAP specification. " "Disconnecting..."); purple_proxy_connect_data_disconnect(connect_data, - _("Received invalid data on connection with server.")); + _("Received invalid data on connection with server")); return -1; } break; @@ -1803,7 +1803,7 @@ if (len == 0) { purple_proxy_connect_data_disconnect(connect_data, - _("Server closed the connection.")); + _("Server closed the connection")); return; } @@ -1814,7 +1814,7 @@ /* Error! */ purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Lost connection with server:\n%s"), g_strerror(errno)); + _("Lost connection with server: %s"), g_strerror(errno)); return; } @@ -1878,7 +1878,7 @@ if (len == 0) { purple_proxy_connect_data_disconnect(connect_data, - _("Server closed the connection.")); + _("Server closed the connection")); return; } @@ -1890,7 +1890,7 @@ /* Error! */ purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Lost connection with server:\n%s"), g_strerror(errno)); + _("Lost connection with server: %s"), g_strerror(errno)); return; } @@ -1903,7 +1903,7 @@ if ((connect_data->read_buffer[0] != 0x05) || (connect_data->read_buffer[1] == 0xff)) { purple_proxy_connect_data_disconnect(connect_data, - _("Received invalid data on connection with server.")); + _("Received invalid data on connection with server")); return; } @@ -2044,7 +2044,7 @@ if (connect_data->fd < 0) { purple_proxy_connect_data_disconnect_formatted(connect_data, - _("Unable to create socket:\n%s"), g_strerror(errno)); + _("Unable to create socket: %s"), g_strerror(errno)); return; } @@ -2156,7 +2156,7 @@ if (hosts == NULL) { - purple_proxy_connect_data_disconnect(connect_data, _("Could not resolve host name")); + purple_proxy_connect_data_disconnect(connect_data, _("Unable to resolve hostname")); return; }