Mercurial > pidgin.yaz
changeset 22041:da0b37abe4bd
Adjust some network error fatalities and things
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 08 Jan 2008 03:03:15 +0000 |
| parents | 72712558e2be |
| children | 7553cbc95504 |
| files | libpurple/connection.c |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/connection.c Tue Jan 08 03:02:08 2008 +0000 +++ b/libpurple/connection.c Tue Jan 08 03:03:15 2008 +0000 @@ -542,16 +542,18 @@ switch (ssl_error) { case PURPLE_SSL_HANDSHAKE_FAILED: + reason = PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR; + break; case PURPLE_SSL_CONNECT_FAILED: - reason = PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR; + reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; break; case PURPLE_SSL_CERTIFICATE_INVALID: /* TODO: maybe PURPLE_SSL_* should be more specific? */ - reason = PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR; + reason = PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR: break; default: g_assert_not_reached (); - reason = PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR; + reason = PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR: } purple_connection_error_reason (gc, reason, @@ -564,12 +566,12 @@ switch (reason) { case PURPLE_CONNECTION_ERROR_NETWORK_ERROR: + case PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR: return FALSE; case PURPLE_CONNECTION_ERROR_INVALID_USERNAME: case PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED: case PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE: case PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT: - case PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR: case PURPLE_CONNECTION_ERROR_NAME_IN_USE: case PURPLE_CONNECTION_ERROR_INVALID_SETTINGS: case PURPLE_CONNECTION_ERROR_OTHER_ERROR: