pidgin/android/libpurple2

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

2013-03-06, Andrew Victor
75ff728af11c
Parents 5c8caea5bd66
Children 5d2f3ca02596
Fix merge error from release-2.x.y.
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    libpurple/protocols/mxit/http.c
    • --- a/libpurple/protocols/mxit/http.c Wed Mar 06 10:34:45 2013 -0500
    +++ b/libpurple/protocols/mxit/http.c Wed Mar 06 23:15:58 2013 +0200
    @@ -329,7 +329,7 @@
    /* 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" ) );
    }
    }