pidgin: 03ee404f: Remove trailing periods from short disco...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 03ee404f3c1ea6691cdcfd91078e936c04033975
Ancestor: 7cdcde5a63cc2b7840b493177a5b9c56d6918824
Author: markdoliner at pidgin.im
Date: 2009-07-06T05:29:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/03ee404f3c1ea6691cdcfd91078e936c04033975

Modified files:
        libpurple/protocols/oscar/flap_connection.c

ChangeLog: 

Remove trailing periods from short disconnection error messags and remove
newlines between the error description and the g_strerror() output.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/flap_connection.c	32ddfe9a1049e710cab2dcd293f285be92fd97ab
+++ libpurple/protocols/oscar/flap_connection.c	e76486f40fd307c094c39f6a6cc824b1df476d54
@@ -469,18 +469,18 @@ flap_connection_destroy_cb(gpointer data
 
 		if (conn->disconnect_code == 0x0001) {
 			reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
-			tmp = g_strdup(_("You have signed on from another location."));
+			tmp = g_strdup(_("You have signed on from another location"));
 			if (!purple_account_get_remember_password(account))
 				purple_account_set_password(account, NULL);
 		} else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
-			tmp = g_strdup(_("Server closed the connection."));
+			tmp = g_strdup(_("Server closed the connection"));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
-			tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+			tmp = g_strdup_printf(_("Lost connection with server: %s"),
 					conn->error_message);
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)
-			tmp = g_strdup(_("Received invalid data on connection with server."));
+			tmp = g_strdup(_("Received invalid data on connection with server"));
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
-			tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
+			tmp = g_strdup_printf(_("Could not establish a connection with the server: %s"),
 					conn->error_message);
 		else
 			/*
@@ -1053,7 +1053,7 @@ send_cb(gpointer data, gint source, Purp
 		ret = send(conn->fd, conn->buffer_outgoing->outptr, writelen, 0);
 	if (ret <= 0)
 	{
-		if (ret < 0 && ((errno == EAGAIN) || (errno == EWOULDBLOCK)))
+		if (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK))
 			/* No worries */
 			return;