pidgin: 2f7d2d89: Change last remaining users of purple_co...
markdoliner at pidgin.im
markdoliner at pidgin.im
Sun Aug 21 04:08:33 EDT 2011
----------------------------------------------------------------------
Revision: 2f7d2d895e858ebd11a3e2991ffd139fdc404017
Parent: 2b73ff57ff12722b94a5f9bca55d75c72912af38
Author: markdoliner at pidgin.im
Date: 08/21/11 03:49:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2f7d2d895e858ebd11a3e2991ffd139fdc404017
Changelog:
Change last remaining users of purple_connection_error to use
purple_connection_error_reason. The "reason" I used in this code
is probably not the most appropriate reason. My goal was to retain
the same behavior before and after this change.
It's not a bad idea for someone to look at each of these calls and
determine if a different reason should be used... but it hasn't seemed
to cause problems so far, so maybe it doesn't matter.
Changes against parent 2b73ff57ff12722b94a5f9bca55d75c72912af38
patched libpurple/protocols/mxit/http.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/mxit/protocol.c
patched libpurple/protocols/zephyr/zephyr.c
-------------- next part --------------
============================================================
--- libpurple/protocols/zephyr/zephyr.c 6a482da35b03ebe95b82b74e2697bc2269de6c8a
+++ libpurple/protocols/zephyr/zephyr.c 3e9a51760bb929a4a01fdcf3148844a354e03685
@@ -146,7 +146,7 @@ struct _zephyr_triple {
return TRUE;
#define z_call_s(func, err) if (func != ZERR_NONE) {\
- purple_connection_error(gc, err);\
+ purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, err);\
return;\
}
@@ -1585,7 +1585,7 @@ static void zephyr_login(PurpleAccount *
/* XXX z_call_s should actually try to report the com_err determined error */
if (use_tzc(zephyr)) {
pid_t pid;
- /* purple_connection_error(gc,"tzc not supported yet"); */
+ /* purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "tzc not supported yet"); */
if ((pipe(zephyr->totzc) != 0) || (pipe(zephyr->fromtzc) != 0)) {
purple_debug_error("zephyr", "pipe creation failed. killing\n");
exit(-1);
@@ -1706,7 +1706,7 @@ static void zephyr_login(PurpleAccount *
ptr++;
}
if (ptr >=bufcur) {
- purple_connection_error(gc,"invalid output by tzc (or bad parsing code)");
+ purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "invalid output by tzc (or bad parsing code)");
free(buf);
return;
}
@@ -1821,7 +1821,7 @@ static void zephyr_login(PurpleAccount *
purple_debug_info("zephyr","realm: %s\n",zephyr->realm);
}
else {
- purple_connection_error(gc,"Only ZEPH0.2 supported currently");
+ purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "Only ZEPH0.2 supported currently");
return;
}
purple_debug_info("zephyr","does it get here\n");
============================================================
--- libpurple/protocols/mxit/http.c ea9ce725c8fc71cd140d4c946df23c58b5bec956
+++ libpurple/protocols/mxit/http.c 9e169cadb80750e392ae7fb62e31861e012e7f39
@@ -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;
}
============================================================
--- libpurple/protocols/mxit/login.c 79859aa4b6d39b6e751a8c32a00c4f5695fc9ab9
+++ libpurple/protocols/mxit/login.c d94b4a58d73bbdf41622cb2a4993343e78501b90
@@ -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;
}
@@ -611,7 +611,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;
}
@@ -620,7 +620,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;
}
============================================================
--- libpurple/protocols/mxit/protocol.c 148f05b7484e2298528c3d37abf76360e1c7115a
+++ libpurple/protocols/mxit/protocol.c b41d4d6188420e4d19d566203030eb0634afeda9
@@ -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;
}
@@ -2192,7 +2192,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;
}
@@ -2361,7 +2361,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 */
@@ -2375,7 +2375,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 :
@@ -2643,7 +2643,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;
}
@@ -2708,12 +2708,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 {
@@ -2723,7 +2723,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;
@@ -2734,7 +2734,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;
}
}
@@ -2745,12 +2745,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