/pidgin/main: 75ff728af11c: Fix merge error from release-2.x.y.

[Andrew Victor]

Changeset: 75ff728af11c14bb1303651f7007b39cf5942dba
Author:	 Andrew Victor <andrew.victor at mxit.com>
Date:	 2013-03-06 23:15 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/75ff728af11c

Description:

Fix merge error from release-2.x.y.

diffstat:

 libpurple/protocols/mxit/http.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/libpurple/protocols/mxit/http.c b/libpurple/protocols/mxit/http.c
--- a/libpurple/protocols/mxit/http.c
+++ b/libpurple/protocols/mxit/http.c
@@ -329,7 +329,7 @@ void mxit_http_send_request( struct MXit
 	/* open connection to the HTTP server */
 	con = purple_proxy_connect( NULL, session->acc, host, port, mxit_cb_http_connect, req );
 	if ( !con ) {
-		purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Unable to connect" ) );
+		purple_connection_error( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Unable to connect" ) );
 	}
 }