Mercurial > pidgin
diff libpurple/protocols/novell/novell.c @ 20778:8174f6999308
Sprinkle gc->wants_to_die = TRUE liberally around connection errors that really
ought to have been setting it already so that it is always set when a
disconnection reason is fatal. In a couple of other places, fix the reason to
be more accurate and not be fatal.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 05 Oct 2007 18:33:27 +0000 |
| parents | f3cfcbbac3d8 |
| children | 682543aced31 |
line wrap: on
line diff
--- a/libpurple/protocols/novell/novell.c Fri Oct 05 16:50:54 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Fri Oct 05 18:33:27 2007 +0000 @@ -2178,7 +2178,8 @@ */ /* ...but for now just error out with a nice message. */ - purple_connection_error_reason (gc, PURPLE_REASON_OTHER_ERROR, + gc->wants_to_die = TRUE; + purple_connection_error_reason (gc, PURPLE_REASON_INVALID_SETTINGS, _("Unable to connect to server. Please enter the " "address of the server you wish to connect to.")); return; @@ -2206,6 +2207,7 @@ user->conn->addr, user->conn->port, novell_ssl_connected_cb, novell_ssl_connect_error, gc); if (user->conn->ssl_conn->data == NULL) { + gc->wants_to_die = TRUE; purple_connection_error_reason (gc, PURPLE_REASON_ENCRYPTION_ERROR, _("Error. SSL support is not installed."));