changeset 27457:70629a4a89ec

Remove periods and newlines from many error messages that end up being used when calling purple_connection_error(). I think these look cleaner this way. I'm hoping this won't harm many other places... I know purple_proxy_connect() is used all over the place
author Mark Doliner <mark@kingant.net>
date Mon, 06 Jul 2009 05:33:27 +0000
parents fe912af02ff6
children 70e64287f790
files libpurple/proxy.c
diffstat 1 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/proxy.c	Mon Jul 06 05:29:46 2009 +0000
+++ b/libpurple/proxy.c	Mon Jul 06 05:33:27 2009 +0000
@@ -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;
 	}