Mercurial > pidgin.yaz
diff libpurple/protocols/irc/irc.c @ 21358:ba41f2a60253
Rename:
* PurpleDisconnectReason to PurpleConnectionError;
* elements of that enum from PURPLE_REASON_* to PURPLE_CONNECTION_ERROR_*;
* purple_connection_reason_is_fatal to purple_connection_error_is_fatal.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sun, 14 Oct 2007 21:08:42 +0000 |
| parents | efa448405f3d |
| children | 38cc722159ff |
line wrap: on
line diff
--- a/libpurple/protocols/irc/irc.c Sun Oct 14 12:19:20 2007 +0000 +++ b/libpurple/protocols/irc/irc.c Sun Oct 14 21:08:42 2007 +0000 @@ -124,7 +124,8 @@ return; else if (ret <= 0) { PurpleConnection *gc = purple_account_get_connection(irc->account); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Server has disconnected")); return; } @@ -163,7 +164,8 @@ irc->gsc ? " (ssl)" : "", tosend); */ if (ret <= 0 && errno != EAGAIN) { PurpleConnection *gc = purple_account_get_connection(irc->account); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Server has disconnected")); } else if (ret < buflen) { if (ret < 0) @@ -297,7 +299,8 @@ gc->flags |= PURPLE_CONNECTION_NO_NEWLINES; if (strpbrk(username, " \t\v\r\n") != NULL) { - purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, _("IRC nicks may not contain whitespace")); return; } @@ -327,7 +330,8 @@ purple_account_get_int(account, "port", IRC_DEFAULT_SSL_PORT), irc_login_cb_ssl, irc_ssl_connect_failure, gc); } else { - purple_connection_error_reason (gc, PURPLE_REASON_NO_SSL_SUPPORT, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("SSL support unavailable")); return; } @@ -339,7 +343,8 @@ purple_account_get_int(account, "port", IRC_DEFAULT_PORT), irc_login_cb, gc) == NULL) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Couldn't create socket")); return; } @@ -420,7 +425,8 @@ struct irc_conn *irc = gc->proto_data; if (source < 0) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Couldn't connect to host")); return; } @@ -609,11 +615,13 @@ /* Try again later */ return; } else if (len < 0) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Read error")); return; } else if (len == 0) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Server has disconnected")); return; } @@ -636,11 +644,13 @@ if (len < 0 && errno == EAGAIN) { return; } else if (len < 0) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Read error")); return; } else if (len == 0) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Server has disconnected")); return; }