/pidgin/main: 6a68fcbadb5c: Backported from Mxit protocol in 3.0...
Andrew Victor
andrew.victor at mxit.com
Sat Jul 28 18:48:58 EDT 2012
Changeset: 6a68fcbadb5c1c1279fda44b2ca5358c2b0451ba
Author: Andrew Victor <andrew.victor at mxit.com>
Date: 2012-07-28 22:16 +0200
Branch: mxit-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/6a68fcbadb5c
Description:
Backported from Mxit protocol in 3.0.0-devel:
* Use purple_connection_error_reason()
diffstat:
libpurple/protocols/mxit/http.c | 2 +-
libpurple/protocols/mxit/login.c | 24 ++++++++++++------------
libpurple/protocols/mxit/protocol.c | 24 ++++++++++++------------
3 files changed, 25 insertions(+), 25 deletions(-)
diffs (207 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
@@ -273,7 +273,7 @@ static void mxit_cb_http_connect( gpoint
/* source is the file descriptor of the new connection */
if ( source < 0 ) {
purple_debug_info( MXIT_PLUGIN_ID, "mxit_cb_http_connect failed: %s\n", error_message );
- purple_connection_error( req->session->con, _( "Unable to connect to the MXit HTTP server. Please check your server settings." ) );
+ purple_connection_error_reason( req->session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Unable to connect to the MXit HTTP server. Please check your server settings." ) );
return;
}
diff --git a/libpurple/protocols/mxit/login.c b/libpurple/protocols/mxit/login.c
--- a/libpurple/protocols/mxit/login.c
+++ b/libpurple/protocols/mxit/login.c
@@ -165,7 +165,7 @@ static void mxit_cb_connect( gpointer us
/* source is the file descriptor of the new connection */
if ( source < 0 ) {
purple_debug_info( MXIT_PLUGIN_ID, "mxit_cb_connect failed: %s\n", error_message );
- purple_connection_error( session->con, _( "Unable to connect to the MXit server. Please check your server settings." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Unable to connect to the MXit server. Please check your server settings." ) );
return;
}
@@ -202,7 +202,7 @@ static void mxit_login_connect( struct M
/* socket connection */
data = purple_proxy_connect( session->con, session->acc, session->server, session->port, mxit_cb_connect, session );
if ( !data ) {
- purple_connection_error( session->con, _( "Unable to connect to the MXit server. Please check your server settings." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Unable to connect to the MXit server. Please check your server settings." ) );
return;
}
}
@@ -391,7 +391,7 @@ static void mxit_cb_clientinfo2( PurpleU
if ( !url_text ) {
/* no reply from the WAP site */
- purple_connection_error( session->con, _( "Error contacting the MXit WAP site. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Error contacting the MXit WAP site. Please try again later." ) );
return;
}
@@ -400,7 +400,7 @@ static void mxit_cb_clientinfo2( PurpleU
if ( !parts ) {
/* wapserver error */
- purple_connection_error( session->con, _( "MXit is currently unable to process the request. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "MXit is currently unable to process the request. Please try again later." ) );
return;
}
@@ -410,26 +410,26 @@ static void mxit_cb_clientinfo2( PurpleU
/* valid reply! */
break;
case '1' :
- purple_connection_error( session->con, _( "Wrong security code entered. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Wrong security code entered. Please try again later." ) );
return;
case '2' :
- purple_connection_error( session->con, _( "Your session has expired. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Your session has expired. Please try again later." ) );
return;
case '5' :
- purple_connection_error( session->con, _( "Invalid country selected. Please try again." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Invalid country selected. Please try again." ) );
return;
case '6' :
- purple_connection_error( session->con, _( "The MXit ID you entered is not registered. Please register first." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "The MXit ID you entered is not registered. Please register first." ) );
return;
case '7' :
- purple_connection_error( session->con, _( "The MXit ID you entered is already registered. Please choose another." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "The MXit ID you entered is already registered. Please choose another." ) );
/* this user's account already exists, so we need to change the registration login flag to be login */
purple_account_set_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN );
return;
case '3' :
case '4' :
default :
- purple_connection_error( session->con, _( "Internal error. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Internal error. Please try again later." ) );
return;
}
@@ -624,7 +624,7 @@ static void mxit_cb_clientinfo1( PurpleU
if ( !url_text ) {
/* no reply from the WAP site */
- purple_connection_error( session->con, _( "Error contacting the MXit WAP site. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Error contacting the MXit WAP site. Please try again later." ) );
return;
}
@@ -633,7 +633,7 @@ static void mxit_cb_clientinfo1( PurpleU
if ( ( !parts ) || ( parts[0][0] != '0' ) ) {
/* server could not find the user */
- purple_connection_error( session->con, _( "MXit is currently unable to process the request. Please try again later." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "MXit is currently unable to process the request. Please try again later." ) );
return;
}
diff --git a/libpurple/protocols/mxit/protocol.c b/libpurple/protocols/mxit/protocol.c
--- a/libpurple/protocols/mxit/protocol.c
+++ b/libpurple/protocols/mxit/protocol.c
@@ -408,7 +408,7 @@ static void mxit_send_packet( struct MXi
res = mxit_write_sock_packet( session->fd, data, datalen );
if ( res < 0 ) {
/* we must have lost the connection, so terminate it so that we can reconnect */
- purple_connection_error( session->con, _( "We have lost the connection to MXit. Please reconnect." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "We have lost the connection to MXit. Please reconnect." ) );
}
}
else {
@@ -530,7 +530,7 @@ static void mxit_manage_queue( struct MX
if ( session->last_tx <= mxit_now_milli() - ( MXIT_ACK_TIMEOUT * 1000 ) ) {
/* ack timeout! so we close the connection here */
purple_debug_info( MXIT_PLUGIN_ID, "mxit_manage_queue: Timeout awaiting ACK for command '%i'\n", session->outack );
- purple_connection_error( session->con, _( "Timeout while waiting for a response from the MXit server." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Timeout while waiting for a response from the MXit server." ) );
}
return;
}
@@ -2235,7 +2235,7 @@ static void mxit_perform_redirect( struc
session->port = atoi( host[2] );
}
else {
- purple_connection_error( session->con, _( "Cannot perform redirect using the specified protocol" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Cannot perform redirect using the specified protocol" ) );
goto redirect_fail;
}
@@ -2409,7 +2409,7 @@ static int process_error_response( struc
if ( packet->errcode == MXIT_ERRCODE_LOGGEDOUT ) {
/* we are not currently logged in, so we need to reconnect */
- purple_connection_error( session->con, _( errdesc ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( errdesc ) );
}
/* packet command */
@@ -2423,7 +2423,7 @@ static int process_error_response( struc
}
else {
snprintf( errmsg, sizeof( errmsg ), _( "Login error: %s (%i)" ), errdesc, packet->errcode );
- purple_connection_error( session->con, errmsg );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, errmsg );
return -1;
}
case CP_CMD_LOGOUT :
@@ -2691,7 +2691,7 @@ int mxit_parse_packet( struct MXitSessio
if ( packet.rcount < 2 ) {
/* bad packet */
- purple_connection_error( session->con, _( "Invalid packet received from MXit." ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Invalid packet received from MXit." ) );
free_rx_packet( &packet );
continue;
}
@@ -2756,12 +2756,12 @@ void mxit_cb_rx( gpointer user_data, gin
len = read( session->fd, &ch, 1 );
if ( len < 0 ) {
/* connection error */
- purple_connection_error( session->con, _( "A connection error occurred to MXit. (read stage 0x01)" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "A connection error occurred to MXit. (read stage 0x01)" ) );
return;
}
else if ( len == 0 ) {
/* connection closed */
- purple_connection_error( session->con, _( "A connection error occurred to MXit. (read stage 0x02)" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "A connection error occurred to MXit. (read stage 0x02)" ) );
return;
}
else {
@@ -2771,7 +2771,7 @@ void mxit_cb_rx( gpointer user_data, gin
session->rx_lbuf[session->rx_i] = '\0';
session->rx_res = atoi( &session->rx_lbuf[3] );
if ( session->rx_res > CP_MAX_PACKET ) {
- purple_connection_error( session->con, _( "A connection error occurred to MXit. (read stage 0x03)" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "A connection error occurred to MXit. (read stage 0x03)" ) );
}
session->rx_state = RX_STATE_DATA;
session->rx_i = 0;
@@ -2782,7 +2782,7 @@ void mxit_cb_rx( gpointer user_data, gin
session->rx_i++;
if ( session->rx_i >= sizeof( session->rx_lbuf ) ) {
/* malformed packet length record (too long) */
- purple_connection_error( session->con, _( "A connection error occurred to MXit. (read stage 0x04)" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "A connection error occurred to MXit. (read stage 0x04)" ) );
return;
}
}
@@ -2793,12 +2793,12 @@ void mxit_cb_rx( gpointer user_data, gin
len = read( session->fd, &session->rx_dbuf[session->rx_i], session->rx_res );
if ( len < 0 ) {
/* connection error */
- purple_connection_error( session->con, _( "A connection error occurred to MXit. (read stage 0x05)" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "A connection error occurred to MXit. (read stage 0x05)" ) );
return;
}
else if ( len == 0 ) {
/* connection closed */
- purple_connection_error( session->con, _( "A connection error occurred to MXit. (read stage 0x06)" ) );
+ purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "A connection error occurred to MXit. (read stage 0x06)" ) );
return;
}
else {
More information about the Commits
mailing list