im.pidgin.pidgin: 5242231497cb8f7c2424526217e513755f6c283b

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 5242231497cb8f7c2424526217e513755f6c283b
Ancestor: 9489ba463a44839babe64da2fed4e9ef33146cbf
Author: nosnilmot at pidgin.im
Date: 2008-01-08T03:03:15
Branch: im.pidgin.pidgin

Modified files:
        libpurple/connection.c

ChangeLog: 

Adjust some network error fatalities and things

-------------- next part --------------
============================================================
--- libpurple/connection.c	150dc58137978d835511891eeedc081cba3bbc7d
+++ libpurple/connection.c	71ffc496c4bd76413a57e6a045a95192815d4128
@@ -542,16 +542,18 @@ purple_connection_ssl_error (PurpleConne
 
 	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 @@ purple_connection_error_is_fatal (Purple
 	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: