Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/msn/session.c	Sun Oct 14 12:19:20 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Sun Oct 14 21:08:42 2007 +0000
@@ -325,7 +325,7 @@
 					  const char *info)
 {
 	PurpleConnection *gc;
-	PurpleDisconnectReason reason;
+	PurpleConnectionError reason;
 	char *msg;
 
 	gc = purple_account_get_connection(session->account);
@@ -333,49 +333,49 @@
 	switch (error)
 	{
 		case MSN_ERROR_SERVCONN:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(info);
 			break;
 		case MSN_ERROR_UNSUPPORTED_PROTOCOL:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("Our protocol is not supported by the "
 							 "server."));
 			break;
 		case MSN_ERROR_HTTP_MALFORMED:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("Error parsing HTTP."));
 			break;
 		case MSN_ERROR_SIGN_OTHER:
-			reason = PURPLE_REASON_NAME_IN_USE;
+			reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
 			msg = g_strdup(_("You have signed on from another location."));
 			if (!purple_account_get_remember_password(session->account))
 				purple_account_set_password(session->account, NULL);
 			break;
 		case MSN_ERROR_SERV_UNAVAILABLE:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("The MSN servers are temporarily "
 							 "unavailable. Please wait and try "
 							 "again."));
 			break;
 		case MSN_ERROR_SERV_DOWN:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("The MSN servers are going down "
 							 "temporarily."));
 			break;
 		case MSN_ERROR_AUTH:
-			reason = PURPLE_REASON_AUTHENTICATION_FAILED;
+			reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 			msg = g_strdup_printf(_("Unable to authenticate: %s"),
 								  (info == NULL ) ?
 								  _("Unknown error") : info);
 			break;
 		case MSN_ERROR_BAD_BLIST:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("Your MSN buddy list is temporarily "
 							 "unavailable. Please wait and try "
 							 "again."));
 			break;
 		default:
-			reason = PURPLE_REASON_NETWORK_ERROR;
+			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 			msg = g_strdup(_("Unknown error."));
 			break;
 	}