Mercurial > pidgin.yaz
changeset 27456:fe912af02ff6
Remove trailing periods from short disconnection error messags and remove
newlines between the error description and the g_strerror() output.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 06 Jul 2009 05:29:46 +0000 |
| parents | 2873ee6a960d |
| children | 70629a4a89ec |
| files | libpurple/protocols/oscar/flap_connection.c |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/flap_connection.c Mon Jul 06 05:28:59 2009 +0000 +++ b/libpurple/protocols/oscar/flap_connection.c Mon Jul 06 05:29:46 2009 +0000 @@ -469,18 +469,18 @@ 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 @@ 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;