From 84b045d409f1e8da6d8bf379c6fef7236dcd9bcd Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 15 Apr 2007 18:03:08 -0700 Subject: s/imc/imcb/ for callback functions. Moved things aroundin nogaim.h a little bit, grouping things by category instead of original Gaim 0.58 filename. --- protocols/jabber/jabber.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/jabber/jabber.c') diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index af294d90..e560fda0 100644 --- a/protocols/jabber/jabber.c +++ b/protocols/jabber/jabber.c @@ -58,7 +58,7 @@ static void jabber_init( account_t *acc ) static void jabber_login( account_t *acc ) { - struct im_connection *ic = imc_new( acc ); + struct im_connection *ic = imcb_new( acc ); struct jabber_data *jd = g_new0( struct jabber_data, 1 ); struct ns_srv_reply *srv = NULL; char *connect_to, *s; @@ -71,7 +71,7 @@ static void jabber_login( account_t *acc ) if( jd->server == NULL ) { - imc_error( ic, "Incomplete account name (format it like )" ); + imcb_error( ic, "Incomplete account name (format it like )" ); imc_logout( ic, FALSE ); return; } @@ -158,12 +158,12 @@ static void jabber_login( account_t *acc ) else connect_to = jd->server; - imc_log( ic, "Connecting" ); + imcb_log( ic, "Connecting" ); if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN || set_getint( &acc->set, "port" ) > JABBER_PORT_MAX ) { - imc_log( ic, "Incorrect port number, must be in the %d-%d range", + imcb_log( ic, "Incorrect port number, must be in the %d-%d range", JABBER_PORT_MIN, JABBER_PORT_MAX ); imc_logout( ic, FALSE ); return; @@ -185,7 +185,7 @@ static void jabber_login( account_t *acc ) if( jd->fd == -1 ) { - imc_error( ic, "Could not connect to server" ); + imcb_error( ic, "Could not connect to server" ); imc_logout( ic, TRUE ); } } @@ -284,7 +284,7 @@ static void jabber_get_info( struct im_connection *ic, char *who ) while( bud ) { - imc_log( ic, "Buddy %s (%d) information:\nAway state: %s\nAway message: %s", + imcb_log( ic, "Buddy %s (%d) information:\nAway state: %s\nAway message: %s", bud->full_jid, bud->priority, bud->away_state ? bud->away_state->full_name : "(none)", bud->away_message ? : "(none)" ); -- cgit v1.2.3