aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/jabber.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2007-04-15 18:03:08 -0700
committerWilmer van der Gaast <wilmer@gaast.net>2007-04-15 18:03:08 -0700
commit84b045d409f1e8da6d8bf379c6fef7236dcd9bcd (patch)
tree765681f302614273ac61e1560955a7307252097e /protocols/jabber/jabber.c
parentc2fb38096ea4e75a680e57e103d4a4986aa84c75 (diff)
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.
Diffstat (limited to 'protocols/jabber/jabber.c')
-rw-r--r--protocols/jabber/jabber.c12
1 files changed, 6 insertions, 6 deletions
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 <username@jabberserver.name>)" );
+ imcb_error( ic, "Incomplete account name (format it like <username@jabberserver.name>)" );
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)" );