diff libpurple/protocols/msn/msn.c @ 32360:9aee8493db7f

merged from im.pidgin.pidgin

--- a/libpurple/protocols/msn/msn.c	Sun Jun 26 18:53:44 2011 +0900
+++ b/libpurple/protocols/msn/msn.c	Mon Aug 22 11:20:05 2011 +0900
@@ -275,7 +275,7 @@
 		return;
 	}
 
-	if (*real_alias == '\0') {
+	if (real_alias[0] == '\0') {
 		real_alias = purple_url_encode(purple_account_get_username(account));
 	}
 
@@ -1360,7 +1360,7 @@
 
 	if (!purple_ssl_is_supported())
 	{
-		purple_connection_error_reason(gc,
+		purple_connection_error(gc,
 			PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 			_("SSL support is needed for MSN. Please install a supported "
 			  "SSL library."));
@@ -1401,7 +1401,7 @@
 	}
 
 	if (!msn_session_connect(session, host, port, http_method))
-		purple_connection_error_reason(gc,
+		purple_connection_error(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			_("Unable to connect"));
 }