diff options
Diffstat (limited to 'protocols/jabber/jabber.c')
| -rw-r--r-- | protocols/jabber/jabber.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c index 23de1103..ec0df487 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 = new_gaim_conn( acc ); + struct im_connection *ic = imc_new( acc ); struct jabber_data *jd = g_new0( struct jabber_data, 1 ); struct ns_srv_reply *srv = NULL; char *connect_to, *s; @@ -71,8 +71,8 @@ static void jabber_login( account_t *acc ) if( jd->server == NULL ) { - hide_login_progress( ic, "Incomplete account name (format it like <username@jabberserver.name>)" ); - signoff( ic ); + imc_error( ic, "Incomplete account name (format it like <username@jabberserver.name>)" ); + imc_logout( ic ); return; } @@ -158,14 +158,14 @@ static void jabber_login( account_t *acc ) else connect_to = jd->server; - set_login_progress( ic, 0, "Connecting" ); + imc_log( ic, "Connecting" ); if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN || set_getint( &acc->set, "port" ) > JABBER_PORT_MAX ) { - serv_got_crap( ic, "Incorrect port number, must be in the %d-%d range", + imc_log( ic, "Incorrect port number, must be in the %d-%d range", JABBER_PORT_MIN, JABBER_PORT_MAX ); - signoff( ic ); + imc_logout( ic ); return; } @@ -185,8 +185,8 @@ static void jabber_login( account_t *acc ) if( jd->fd == -1 ) { - hide_login_progress( ic, "Could not connect to server" ); - signoff( ic ); + imc_error( ic, "Could not connect to server" ); + imc_logout( ic ); } } @@ -284,7 +284,7 @@ static void jabber_get_info( struct im_connection *ic, char *who ) while( bud ) { - serv_got_crap( ic, "Buddy %s (%d) information:\nAway state: %s\nAway message: %s", + imc_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)" ); |