Changeset 84b045d for protocols

Timestamp:

2007-04-16T01:03:08Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6bbb939

Parents:

c2fb3809

Message:

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.

Location:

protocols

Files:

• jabber/io.c (modified) (12 diffs)
• jabber/iq.c (modified) (15 diffs)
• jabber/jabber.c (modified) (5 diffs)
• jabber/jabber_util.c (modified) (2 diffs)
• jabber/presence.c (modified) (3 diffs)
• jabber/sasl.c (modified) (6 diffs)
• msn/msn.c (modified) (5 diffs)
• msn/msn_util.c (modified) (4 diffs)
• msn/ns.c (modified) (33 diffs)
• msn/sb.c (modified) (3 diffs)
• nogaim.c (modified) (31 diffs)
• nogaim.h (modified) (2 diffs)
• oscar/chat.c (modified) (3 diffs)
• oscar/chatnav.c (modified) (4 diffs)
• oscar/icq.c (modified) (1 diff)
• oscar/im.c (modified) (4 diffs)
• oscar/info.c (modified) (3 diffs)
• oscar/oscar.c (modified) (40 diffs)
• oscar/rxqueue.c (modified) (1 diff)
• oscar/search.c (modified) (1 diff)
• oscar/service.c (modified) (2 diffs)
• oscar/txqueue.c (modified) (4 diffs)
• yahoo/yahoo.c (modified) (12 diffs)

protocols/jabber/io.c

@@ -117 +117 @@
                 jd->fd = -1;
                 
-                imc_error( ic, "Short write() to server" );
+                imcb_error( ic, "Short write() to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
@@ -160 +160 @@
                 if( xt_feed( jd->xt, buf, st ) < 0 )
                 {
-                        imc_error( ic, "XML stream error" );
+                        imcb_error( ic, "XML stream error" );
                         imc_logout( ic, TRUE );
                         return FALSE;
@@ -203 +203 @@
                                         if( set_getbool( &ic->acc->set, "tls" ) )
                                         {
-                                                imc_error( ic, "TLS is turned on for this "
+                                                imcb_error( ic, "TLS is turned on for this "
                                                           "account, but is not supported by this server" );
                                                 imc_logout( ic, FALSE );
@@ -216 +216 @@
                         else
                         {
-                                imc_error( ic, "XML stream error" );
+                                imcb_error( ic, "XML stream error" );
                                 imc_logout( ic, TRUE );
                                 return FALSE;
@@ -227 +227 @@
                 jd->fd = -1;
                 
-                imc_error( ic, "Error while reading from server" );
+                imcb_error( ic, "Error while reading from server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
@@ -242 +242 @@
         if( source == -1 )
         {
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
         }
         
-        imc_log( ic, "Connected to server, logging in" );
+        imcb_log( ic, "Connected to server, logging in" );
         
         return jabber_start_stream( ic );
@@ -263 +263 @@
                 jd->ssl = NULL;
                 
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
         }
         
-        imc_log( ic, "Connected to server, logging in" );
+        imcb_log( ic, "Connected to server, logging in" );
         
         return jabber_start_stream( ic );
@@ -297 +297 @@
                 if( c && ( !trytls && !set_getbool( &ic->acc->set, "tls" ) ) )
                 {
-                        imc_error( ic, "Server requires TLS connections, but TLS is turned off for this account" );
+                        imcb_error( ic, "Server requires TLS connections, but TLS is turned off for this account" );
                         imc_logout( ic, FALSE );
                         
@@ -327 +327 @@
                 if( !trytls && set_getbool( &ic->acc->set, "tls" ) )
                 {
-                        imc_error( ic, "TLS is turned on for this account, but is not supported by this server" );
+                        imcb_error( ic, "TLS is turned on for this account, but is not supported by this server" );
                         imc_logout( ic, FALSE );
                         
@@ -417 +417 @@
         jd->w_inpa = jd->r_inpa = 0;
         
-        imc_log( ic, "Converting stream to TLS" );
+        imcb_log( ic, "Converting stream to TLS" );
         
         jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic );
@@ -453 +453 @@
         if( type == NULL )
         {
-                imc_error( ic, "Unknown stream error reported by server" );
+                imcb_error( ic, "Unknown stream error reported by server" );
                 imc_logout( ic, allow_reconnect );
                 return XT_ABORT;
@@ -463 +463 @@
         if( strcmp( type, "conflict" ) == 0 )
         {
-                imc_error( ic, "Account and resource used from a different location" );
+                imcb_error( ic, "Account and resource used from a different location" );
                 allow_reconnect = FALSE;
         }
         else
         {
-                imc_error( ic, "Stream error: %s%s%s", type, text ? ": " : "", text ? text : "" );
+                imcb_error( ic, "Stream error: %s%s%s", type, text ? ": " : "", text ? text : "" );
         }
         

protocols/jabber/iq.c

@@ -39 +39 @@
         if( !type )
         {
-                imc_error( ic, "Received IQ packet without type." );
+                imcb_error( ic, "Received IQ packet without type." );
                 imc_logout( ic, TRUE );
                 return XT_ABORT;
@@ -60 +60 @@
                 
                 if( entry == NULL )
-                        imc_log( ic, "WARNING: Received IQ-%s packet with unknown/expired ID %s!", type, s );
+                        imcb_log( ic, "WARNING: Received IQ-%s packet with unknown/expired ID %s!", type, s );
                 else if( entry->func )
                         return entry->func( ic, node, entry->node );
@@ -69 +69 @@
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
-                        imc_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
+                        imcb_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
                 }
@@ -132 +132 @@
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
-                        imc_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
+                        imcb_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
                 }
@@ -154 +154 @@
                         else
                         {
-                                imc_log( ic, "WARNING: %s tried to fake a roster push!", s ? s : "(unknown)" );
+                                imcb_log( ic, "WARNING: %s tried to fake a roster push!", s ? s : "(unknown)" );
                                 
                                 xt_free_node( reply );
@@ -219 +219 @@
         if( !( query = xt_find_node( node->children, "query" ) ) )
         {
-                imc_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
+                imcb_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
                 imc_logout( ic, FALSE );
                 return XT_HANDLED;
@@ -258 +258 @@
                 xt_free_node( reply );
                 
-                imc_error( ic, "Can't find suitable authentication method" );
+                imcb_error( ic, "Can't find suitable authentication method" );
                 imc_logout( ic, FALSE );
                 return XT_ABORT;
@@ -277 +277 @@
         if( !( type = xt_find_attr( node, "type" ) ) )
         {
-                imc_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
+                imcb_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
                 imc_logout( ic, FALSE );
                 return XT_HANDLED;
@@ -284 +284 @@
         if( strcmp( type, "error" ) == 0 )
         {
-                imc_error( ic, "Authentication failure" );
+                imcb_error( ic, "Authentication failure" );
                 imc_logout( ic, FALSE );
                 return XT_ABORT;
@@ -311 +311 @@
                 if( c && c->text_len && ( s = strchr( c->text, '/' ) ) &&
                     strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
-                        imc_log( ic, "Server changed session resource string to `%s'", s + 1 );
+                        imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
                 
                 jd->flags &= ~JFLAG_WAIT_BIND;
@@ -334 +334 @@
         int st;
         
-        imc_log( ic, "Authenticated, requesting buddy list" );
+        imcb_log( ic, "Authenticated, requesting buddy list" );
         
         node = xt_new_node( "query", NULL, NULL );
@@ -353 +353 @@
         if( !( query = xt_find_node( node->children, "query" ) ) )
         {
-                imc_log( ic, "WARNING: Received NULL roster packet" );
+                imcb_log( ic, "WARNING: Received NULL roster packet" );
                 return XT_HANDLED;
         }
@@ -397 +397 @@
         
         if( initial )
-                imc_connected( ic );
+                imcb_connected( ic );
         
         return XT_HANDLED;
@@ -428 +428 @@
         {
                 s = xt_find_attr( orig, "to" ); /* If this returns NULL something's wrong.. */
-                imc_log( ic, "Could not retrieve vCard of %s", s ? s : "(NULL)" );
+                imcb_log( ic, "Could not retrieve vCard of %s", s ? s : "(NULL)" );
                 return XT_HANDLED;
         }
@@ -536 +536 @@
         /* *sigh* */
         
-        imc_log( ic, "%s", reply->str );
+        imcb_log( ic, "%s", reply->str );
         g_string_free( reply, TRUE );
         

protocols/jabber/jabber.c

@@ -59 +59 @@
 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;
@@ -72 +72 @@
         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;
@@ -159 +159 @@
                 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 );
@@ -186 +186 @@
         if( jd->fd == -1 )
         {
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
         }
@@ -285 +285 @@
         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)",

protocols/jabber/jabber_util.c

@@ -224 +224 @@
         
         if( find_buddy( bla->ic, bla->handle ) == NULL )
-                show_got_added( bla->ic, bla->handle, NULL );
+                imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -247 +247 @@
         
         buf = g_strdup_printf( "The user %s wants to add you to his/her buddy list.", handle );
-        do_ask_dialog( ic, buf, bla, jabber_buddy_ask_yes, jabber_buddy_ask_no );
+        imcb_ask( ic, buf, bla, jabber_buddy_ask_yes, jabber_buddy_ask_no );
         g_free( buf );
 }

protocols/jabber/presence.c

@@ -41 +41 @@
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
-                                imc_log( ic, "WARNING: Could not handle presence information from JID: %s", from );
+                                imcb_log( ic, "WARNING: Could not handle presence information from JID: %s", from );
                         return XT_HANDLED;
                 }
@@ -74 +74 @@
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
-                                imc_log( ic, "WARNING: Received presence information from unknown JID: %s", from );
+                                imcb_log( ic, "WARNING: Received presence information from unknown JID: %s", from );
                         return XT_HANDLED;
                 }
@@ -103 +103 @@
         {
                 /* Not sure about this one, actually... */
-                imc_log( ic, "%s just accepted your authorization request", from );
+                imcb_log( ic, "%s just accepted your authorization request", from );
         }
         else if( strcmp( type, "unsubscribe" ) == 0 || strcmp( type, "unsubscribed" ) == 0 )

protocols/jabber/sasl.c

@@ -38 +38 @@
                    IQ authentication. Strange things happen when you try
                    to do both... */
-                imc_log( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
+                imcb_log( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
                 return XT_HANDLED;
         }
@@ -45 +45 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                imc_log( ic, "Stream error while authenticating" );
+                imcb_log( ic, "Stream error while authenticating" );
                 imc_logout( ic, FALSE );
                 return XT_ABORT;
@@ -63 +63 @@
         if( !sup_plain && !sup_digest )
         {
-                imc_error( ic, "No known SASL authentication schemes supported" );
+                imcb_error( ic, "No known SASL authentication schemes supported" );
                 imc_logout( ic, FALSE );
                 return XT_ABORT;
@@ -280 +280 @@
 
 error:
-        imc_error( ic, "Incorrect SASL challenge received" );
+        imcb_error( ic, "Incorrect SASL challenge received" );
         imc_logout( ic, FALSE );
 
@@ -304 +304 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                imc_log( ic, "Stream error while authenticating" );
+                imcb_log( ic, "Stream error while authenticating" );
                 imc_logout( ic, FALSE );
                 return XT_ABORT;
@@ -311 +311 @@
         if( strcmp( node->name, "success" ) == 0 )
         {
-                imc_log( ic, "Authentication finished" );
+                imcb_log( ic, "Authentication finished" );
                 jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
         }
         else if( strcmp( node->name, "failure" ) == 0 )
         {
-                imc_error( ic, "Authentication failure" );
+                imcb_error( ic, "Authentication failure" );
                 imc_logout( ic, FALSE );
                 return XT_ABORT;

protocols/msn/msn.c

@@ -39 +39 @@
 static void msn_login( account_t *acc )
 {
-        struct im_connection *ic = imc_new( acc );
+        struct im_connection *ic = imcb_new( acc );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
@@ -47 +47 @@
         if( strchr( acc->user, '@' ) == NULL )
         {
-                imc_error( ic, "Invalid account name" );
+                imcb_error( ic, "Invalid account name" );
                 imc_logout( ic, FALSE );
                 return;
         }
         
-        imc_log( ic, "Connecting" );
+        imcb_log( ic, "Connecting" );
         
         md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, ic );
         if( md->fd < 0 )
         {
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return;
@@ -96 +96 @@
                                 m = l->data;
                         
-                                imc_log( ic, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
+                                imcb_log( ic, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
                                 g_free( m->who );
                                 g_free( m->text );
@@ -228 +228 @@
 {
         /* Just make an URL and let the user fetch the info */
-        imc_log( ic, "%s\n%s: %s%s", _("User Info"), _("For now, fetch yourself"), PROFILE_URL, who );
+        imcb_log( ic, "%s\n%s: %s%s", _("User Info"), _("For now, fetch yourself"), PROFILE_URL, who );
 }
 
@@ -373 +373 @@
         if( strlen( value ) > 129 )
         {
-                imc_log( ic, "Maximum name length exceeded" );
+                imcb_log( ic, "Maximum name length exceeded" );
                 return NULL;
         }

protocols/msn/msn_util.c

@@ -36 +36 @@
         if( st != len )
         {
-                imc_error( ic, "Short write() to main server" );
+                imcb_error( ic, "Short write() to main server" );
                 imc_logout( ic, TRUE );
                 return( 0 );
@@ -46 +46 @@
 int msn_logged_in( struct im_connection *ic )
 {
-        imc_connected( ic );
+        imcb_connected( ic );
         
         return( 0 );
@@ -95 +95 @@
         
         if( find_buddy( bla->ic, bla->handle ) == NULL )
-                show_got_added( bla->ic, bla->handle, NULL );
+                imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -123 +123 @@
                     "The user %s (%s) wants to add you to his/her buddy list.",
                     handle, realname );
-        do_ask_dialog( ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
+        imcb_ask( ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );
 }
 

protocols/msn/ns.c

@@ -47 +47 @@
         if( source == -1 )
         {
-                imc_error( ic, "Could not connect to server" );
+                imcb_error( ic, "Could not connect to server" );
                 imc_logout( ic, TRUE );
                 return FALSE;
@@ -76 +76 @@
         {
                 ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
-                imc_log( ic, "Connected to server, waiting for reply" );
+                imcb_log( ic, "Connected to server, waiting for reply" );
         }
         
@@ -89 +89 @@
         if( msn_handler( md->handler ) == -1 ) /* Don't do this on ret == 0, it's already done then. */
         {
-                imc_error( ic, "Error while reading from server" );
+                imcb_error( ic, "Error while reading from server" );
                 imc_logout( ic, TRUE );
                 
@@ -114 +114 @@
                 if( cmd[2] && strncmp( cmd[2], "MSNP8", 5 ) != 0 )
                 {
-                        imc_error( ic, "Unsupported protocol" );
+                        imcb_error( ic, "Unsupported protocol" );
                         imc_logout( ic, FALSE );
                         return( 0 );
@@ -143 +143 @@
                         if( !server )
                         {
-                                imc_error( ic, "Syntax error" );
+                                imcb_error( ic, "Syntax error" );
                                 imc_logout( ic, TRUE );
                                 return( 0 );
@@ -151 +151 @@
                         server = cmd[3];
                         
-                        imc_log( ic, "Transferring to other server" );
+                        imcb_log( ic, "Transferring to other server" );
                         
                         md->fd = proxy_connect( server, port, msn_ns_connected, ic );
@@ -162 +162 @@
                         if( !server )
                         {
-                                imc_error( ic, "Syntax error" );
+                                imcb_error( ic, "Syntax error" );
                                 imc_logout( ic, TRUE );
                                 return( 0 );
@@ -172 +172 @@
                         if( strcmp( cmd[4], "CKI" ) != 0 )
                         {
-                                imc_error( ic, "Unknown authentication method for switchboard" );
+                                imcb_error( ic, "Unknown authentication method for switchboard" );
                                 imc_logout( ic, TRUE );
                                 return( 0 );
@@ -204 +204 @@
                 else
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -216 +216 @@
                         if( !passport_get_id( msn_auth_got_passport_id, ic, ic->acc->user, ic->acc->pass, cmd[4] ) )
                         {
-                                imc_error( ic, "Error while contacting Passport server" );
+                                imcb_error( ic, "Error while contacting Passport server" );
                                 imc_logout( ic, TRUE );
                                 return( 0 );
@@ -236 +236 @@
                         }
                         
-                        imc_log( ic, "Authenticated, getting buddy list" );
+                        imcb_log( ic, "Authenticated, getting buddy list" );
                         
                         g_snprintf( buf, sizeof( buf ), "SYN %d 0\r\n", ++md->trId );
@@ -243 +243 @@
                 else
                 {
-                        imc_error( ic, "Unknown authentication type" );
+                        imcb_error( ic, "Unknown authentication type" );
                         imc_logout( ic, FALSE );
                         return( 0 );
@@ -252 +252 @@
                 if( num_parts != 4 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -261 +261 @@
                 if( md->handler->msglen <= 0 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -292 +292 @@
                 if( num_parts != 4 && num_parts != 5 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -328 +328 @@
                         if( ic->flags & OPT_LOGGED_IN )
                         {
-                                imc_log( ic, "Successfully transferred to different server" );
+                                imcb_log( ic, "Successfully transferred to different server" );
                                 g_snprintf( buf, sizeof( buf ), "CHG %d %s %d\r\n", ++md->trId, md->away_state->code, 0 );
                                 return( msn_write( ic, buf, strlen( buf ) ) );
@@ -344 +344 @@
                 if( num_parts != 4 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -363 +363 @@
                 if( num_parts != 3 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -385 +385 @@
                 if( num_parts != 6 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -413 +413 @@
                 if( num_parts != 5 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -438 +438 @@
                 if( num_parts != 7 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -448 +448 @@
                 if( !server )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -458 +458 @@
                 if( strcmp( cmd[3], "CKI" ) != 0 )
                 {
-                        imc_error( ic, "Unknown authentication method for switchboard" );
+                        imcb_error( ic, "Unknown authentication method for switchboard" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -478 +478 @@
                         if( strchr( cmd[4], '@' ) == NULL )
                         {
-                                imc_error( ic, "Syntax error" );
+                                imcb_error( ic, "Syntax error" );
                                 imc_logout( ic, TRUE );
                                 return( 0 );
@@ -501 +501 @@
                 if( cmd[1] && strcmp( cmd[1], "OTH" ) == 0 )
                 {
-                        imc_error( ic, "Someone else logged in with your account" );
+                        imcb_error( ic, "Someone else logged in with your account" );
                         allow_reconnect = FALSE;
                 }
                 else if( cmd[1] && strcmp( cmd[1], "SSD" ) == 0 )
                 {
-                        imc_error( ic, "Terminating session because of server shutdown" );
+                        imcb_error( ic, "Terminating session because of server shutdown" );
                 }
                 else
                 {
-                        imc_error( ic, "Session terminated by remote server (reason unknown)" );
+                        imcb_error( ic, "Session terminated by remote server (reason unknown)" );
                 }
                 
@@ -520 +520 @@
                 if( num_parts != 5 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -548 +548 @@
         else if( strcmp( cmd[0], "IPG" ) == 0 )
         {
-                imc_error( ic, "Received IPG command, we don't handle them yet." );
+                imcb_error( ic, "Received IPG command, we don't handle them yet." );
                 
                 md->handler->msglen = atoi( cmd[1] );
@@ -554 +554 @@
                 if( md->handler->msglen <= 0 )
                 {
-                        imc_error( ic, "Syntax error" );
+                        imcb_error( ic, "Syntax error" );
                         imc_logout( ic, TRUE );
                         return( 0 );
@@ -564 +564 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                imc_error( ic, "Error reported by MSN server: %s", err->text );
+                imcb_error( ic, "Error reported by MSN server: %s", err->text );
                 
                 if( err->flags & STATUS_FATAL )
@@ -618 +618 @@
                                 {
                                         if( arg1 )
-                                                imc_log( ic, "The server is going down for maintenance in %s minutes.", arg1 );
+                                                imcb_log( ic, "The server is going down for maintenance in %s minutes.", arg1 );
                                 }
                                 
@@ -635 +635 @@
                                 if( inbox && folders )
                                 {
-                                        imc_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
                                 }
                         }
@@ -645 +645 @@
                                 if( from && fromname )
                                 {
-                                        imc_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+                                        imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
                                 }
                         }
@@ -673 +673 @@
         if( key == NULL )
         {
-                imc_error( ic, "Error during Passport authentication (%s)",
+                imcb_error( ic, "Error during Passport authentication (%s)",
                                rep->error_string ? rep->error_string : "Unknown error" );
                 imc_logout( ic, TRUE );

protocols/msn/sb.c

@@ -222 +222 @@
                 g_slist_free( sb->msgq );
                 
-                imc_log( ic, "Warning: Closing down MSN switchboard connection with "
+                imcb_log( ic, "Warning: Closing down MSN switchboard connection with "
                                    "unsent message to %s, you'll have to resend it.",
                                    sb->who ? sb->who : "(unknown)" );
@@ -321 +321 @@
         if( strcmp( cmd[0], "XFR" ) == 0 )
         {
-                imc_error( ic, "Received an XFR from a switchboard server, unable to comply! This is likely to be a bug, please report it!" );
+                imcb_error( ic, "Received an XFR from a switchboard server, unable to comply! This is likely to be a bug, please report it!" );
                 imc_logout( ic, TRUE );
                 return( 0 );
@@ -528 +528 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                imc_error( ic, "Error reported by switchboard server: %s", err->text );
+                imcb_error( ic, "Error reported by switchboard server: %s", err->text );
                 
                 if( err->flags & STATUS_SB_FATAL )

protocols/nogaim.c

@@ -145 +145 @@
 /* multi.c */
 
-struct im_connection *imc_new( account_t *acc )
+struct im_connection *imcb_new( account_t *acc )
 {
         struct im_connection *ic;
@@ -204 +204 @@
 }
 
-void imc_log( struct im_connection *ic, char *format, ... )
+void imcb_log( struct im_connection *ic, char *format, ... )
 {
         va_list params;
@@ -221 +221 @@
 }
 
-void imc_error( struct im_connection *ic, char *format, ... )
+void imcb_error( struct im_connection *ic, char *format, ... )
 {
         va_list params;
@@ -248 +248 @@
 }
 
-void imc_connected( struct im_connection *ic )
+void imcb_connected( struct im_connection *ic )
 {
         user_t *u;
@@ -260 +260 @@
         u = user_find( ic->irc, ic->irc->nick );
         
-        imc_log( ic, "Logged in" );
+        imcb_log( ic, "Logged in" );
         
         ic->keepalive = b_timeout_add( 60000, send_keepalive, ic );
@@ -267 +267 @@
         /* Also necessary when we're not away, at least for some of the
            protocols. */
-        bim_set_away( ic, u->away );
+        imc_set_away( ic, u->away );
 }
 
@@ -300 +300 @@
                 ic->flags |= OPT_LOGGING_OUT;
         
-        imc_log( ic, "Signing off.." );
+        imcb_log( ic, "Signing off.." );
         
         b_event_remove( ic->keepalive );
@@ -334 +334 @@
                 int delay = set_getint( &irc->set, "auto_reconnect_delay" );
                 
-                imc_log( ic, "Reconnecting in %d seconds..", delay );
+                imcb_log( ic, "Reconnecting in %d seconds..", delay );
                 a->reconnect = b_timeout_add( delay * 1000, auto_reconnect, a );
         }
@@ -344 +344 @@
 /* dialogs.c */
 
-void do_ask_dialog( struct im_connection *ic, char *msg, void *data, void *doit, void *dont )
+void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont )
 {
         query_add( ic->irc, ic, msg, doit, dont, data );
@@ -360 +360 @@
         
         if( set_getbool( &irc->set, "debug" ) && 0 ) /* This message is too useless */
-                imc_log( ic, "Receiving user add from handle: %s", handle );
+                imcb_log( ic, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( ic, handle ) )
         {
                 if( set_getbool( &irc->set, "debug" ) )
-                        imc_log( ic, "User already exists, ignoring add request: %s", handle );
+                        imcb_log( ic, "User already exists, ignoring add request: %s", handle );
                 
                 return;
@@ -448 +448 @@
                 
                 if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->irc->set, "display_namechanges" ) )
-                        imc_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
+                        imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
 }
@@ -475 +475 @@
 }
 
-void show_got_added( struct im_connection *ic, char *handle, const char *realname )
+void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname )
 {
         struct show_got_added_data *data = g_new0( struct show_got_added_data, 1 );
@@ -512 +512 @@
                         if( set_getbool( &ic->irc->set, "debug" ) || g_strcasecmp( set_getstr( &ic->irc->set, "handle_unknown" ), "ignore" ) != 0 )
                         {
-                                imc_log( ic, "serv_got_update() for handle %s:", handle );
-                                imc_log( ic, "loggedin = %d, type = %d", loggedin, type );
+                                imcb_log( ic, "serv_got_update() for handle %s:", handle );
+                                imcb_log( ic, "loggedin = %d, type = %d", loggedin, type );
                         }
                         
@@ -551 +551 @@
         {
                 u->away = g_strdup( "Away" );
-        }
-        else if( ( type & UC_UNAVAILABLE ) && ( strcmp( ic->acc->prpl->name, "jabber" ) == 0 ) )
-        {
-                if( type & UC_DND )
-                        u->away = g_strdup( "Do Not Disturb" );
-                else if( type & UC_XA )
-                        u->away = g_strdup( "Extended Away" );
-                else // if( type & UC_AWAY )
-                        u->away = g_strdup( "Away" );
         }
         else if( ( type & UC_UNAVAILABLE ) && ic->acc->prpl->get_status_string )
@@ -593 +584 @@
                 {
                         if( set_getbool( &irc->set, "debug" ) )
-                                imc_log( ic, "Ignoring message from unknown handle %s", handle );
+                                imcb_log( ic, "Ignoring message from unknown handle %s", handle );
                         
                         return;
@@ -615 +606 @@
                 else
                 {
-                        imc_log( ic, "Message from unknown handle %s:", handle );
+                        imcb_log( ic, "Message from unknown handle %s:", handle );
                         u = user_find( irc, irc->mynick );
                 }
@@ -685 +676 @@
         
         if( set_getbool( &ic->irc->set, "debug" ) )
-                imc_log( ic, "You were removed from conversation 0x%x", (int) c );
+                imcb_log( ic, "You were removed from conversation 0x%x", (int) c );
         
         if( c )
@@ -733 +724 @@
                 irc_privmsg( ic->irc, u, "PRIVMSG", c->channel, "", msg );
         else
-                imc_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, msg );
+                imcb_log( ic, "Message from/to conversation %s@0x%x (unknown conv/user): %s", who, (int) c, msg );
 }
 
@@ -755 +746 @@
         
         if( set_getbool( &ic->irc->set, "debug" ) )
-                imc_log( ic, "Creating new conversation: (id=0x%x,handle=%s)", (int) c, handle );
+                imcb_log( ic, "Creating new conversation: (id=0x%x,handle=%s)", (int) c, handle );
         
         return c;
@@ -769 +760 @@
         
         if( set_getbool( &b->ic->irc->set, "debug" ) )
-                imc_log( b->ic, "User %s added to conversation 0x%x", handle, (int) b );
+                imcb_log( b->ic, "User %s added to conversation 0x%x", handle, (int) b );
         
         /* It might be yourself! */
@@ -803 +794 @@
         
         if( set_getbool( &b->ic->irc->set, "debug" ) )
-                imc_log( b->ic, "User %s removed from conversation 0x%x (%s)", handle, (int) b, reason ? reason : "" );
+                imcb_log( b->ic, "User %s removed from conversation 0x%x (%s)", handle, (int) b, reason ? reason : "" );
         
         /* It might be yourself! */
@@ -929 +920 @@
    them all from some wrappers. We'll start to define some down here: */
 
-int bim_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags )
+int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags )
 {
         char *buf = NULL;
@@ -946 +937 @@
 }
 
-int bim_chat_msg( struct groupchat *c, char *msg, int flags )
+int imc_chat_msg( struct groupchat *c, char *msg, int flags )
 {
         char *buf = NULL;
@@ -962 +953 @@
 }
 
-static char *bim_away_alias_find( GList *gcm, char *away );
-
-int bim_set_away( struct im_connection *ic, char *away )
+static char *imc_away_alias_find( GList *gcm, char *away );
+
+int imc_set_away( struct im_connection *ic, char *away )
 {
         GList *m, *ms;
@@ -995 +986 @@
         else
         {
-                s = bim_away_alias_find( ms, away );
+                s = imc_away_alias_find( ms, away );
                 if( s )
                 {
                         ic->acc->prpl->set_away( ic, s, away );
                         if( set_getbool( &ic->irc->set, "debug" ) )
-                                imc_log( ic, "Setting away state to %s", s );
+                                imcb_log( ic, "Setting away state to %s", s );
                 }
                 else
@@ -1009 +1000 @@
 }
 
-static char *bim_away_alias_list[8][5] =
+static char *imc_away_alias_list[8][5] =
 {
         { "Away from computer", "Away", "Extended away", NULL },
@@ -1021 +1012 @@
 };
 
-static char *bim_away_alias_find( GList *gcm, char *away )
+static char *imc_away_alias_find( GList *gcm, char *away )
 {
         GList *m;
         int i, j;
         
-        for( i = 0; *bim_away_alias_list[i]; i ++ )
-        {
-                for( j = 0; bim_away_alias_list[i][j]; j ++ )
-                        if( g_strncasecmp( away, bim_away_alias_list[i][j], strlen( bim_away_alias_list[i][j] ) ) == 0 )
+        for( i = 0; *imc_away_alias_list[i]; i ++ )
+        {
+                for( j = 0; imc_away_alias_list[i][j]; j ++ )
+                        if( g_strncasecmp( away, imc_away_alias_list[i][j], strlen( imc_away_alias_list[i][j] ) ) == 0 )
                                 break;
                 
-                if( !bim_away_alias_list[i][j] )        /* If we reach the end, this row */
+                if( !imc_away_alias_list[i][j] )        /* If we reach the end, this row */
                         continue;                       /* is not what we want. Next!    */
                 
                 /* Now find an entry in this row which exists in gcm */
-                for( j = 0; bim_away_alias_list[i][j]; j ++ )
+                for( j = 0; imc_away_alias_list[i][j]; j ++ )
                 {
                         m = gcm;
                         while( m )
                         {
-                                if( g_strcasecmp( bim_away_alias_list[i][j], m->data ) == 0 )
-                                        return( bim_away_alias_list[i][j] );
+                                if( g_strcasecmp( imc_away_alias_list[i][j], m->data ) == 0 )
+                                        return( imc_away_alias_list[i][j] );
                                 m = m->next;
                         }
@@ -1051 +1042 @@
 }
 
-void bim_add_allow( struct im_connection *ic, char *handle )
+void imc_add_allow( struct im_connection *ic, char *handle )
 {
         if( g_slist_find_custom( ic->permit, handle, (GCompareFunc) ic->acc->prpl->handle_cmp ) == NULL )
@@ -1061 +1052 @@
 }
 
-void bim_rem_allow( struct im_connection *ic, char *handle )
+void imc_rem_allow( struct im_connection *ic, char *handle )
 {
         GSList *l;
@@ -1074 +1065 @@
 }
 
-void bim_add_block( struct im_connection *ic, char *handle )
+void imc_add_block( struct im_connection *ic, char *handle )
 {
         if( g_slist_find_custom( ic->deny, handle, (GCompareFunc) ic->acc->prpl->handle_cmp ) == NULL )
@@ -1084 +1075 @@
 }
 
-void bim_rem_block( struct im_connection *ic, char *handle )
+void imc_rem_block( struct im_connection *ic, char *handle )
 {
         GSList *l;

protocols/nogaim.h

@@ -150 +150 @@
         
         /* Request profile info. Free-formatted stuff, the IM module gives back
-           this info via imc_log(). */
+           this info via imcb_log(). */
         void (* get_info)       (struct im_connection *, char *who);
         void (* set_my_name)    (struct im_connection *, char *name);
@@ -175 +175 @@
 #define UC_UNAVAILABLE  1
 
-/* JABBER */
-#define UC_AWAY (0x02 | UC_UNAVAILABLE)
-#define UC_CHAT  0x04
-#define UC_XA   (0x08 | UC_UNAVAILABLE)
-#define UC_DND  (0x10 | UC_UNAVAILABLE)
-
+/* im_api core stuff. */
+void nogaim_init();
 G_MODULE_EXPORT GSList *get_connections();
 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
 G_MODULE_EXPORT void register_protocol(struct prpl *);
 
-/* nogaim.c */
-int bim_set_away( struct im_connection *ic, char *away );
-int bim_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
-int bim_chat_msg( struct groupchat *c, char *msg, int flags );
-
-void bim_add_allow( struct im_connection *ic, char *handle );
-void bim_rem_allow( struct im_connection *ic, char *handle );
-void bim_add_block( struct im_connection *ic, char *handle );
-void bim_rem_block( struct im_connection *ic, char *handle );
-
-void nogaim_init();
-char *set_eval_away_devoice( set_t *set, char *value );
-
-gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
-void cancel_auto_reconnect( struct account *a );
-
-/* multi.c */
-G_MODULE_EXPORT struct im_connection *imc_new( account_t *acc );
-G_MODULE_EXPORT void imc_free( struct im_connection *ic );
-G_MODULE_EXPORT void imc_log( struct im_connection *ic, char *format, ... );
-G_MODULE_EXPORT void imc_error( struct im_connection *ic, char *format, ... );
-G_MODULE_EXPORT void imc_connected( struct im_connection *ic );
+/* Connection management. */
+G_MODULE_EXPORT struct im_connection *imcb_new( account_t *acc );
+G_MODULE_EXPORT void imcb_free( struct im_connection *ic );
+G_MODULE_EXPORT void imcb_connected( struct im_connection *ic );
 G_MODULE_EXPORT void imc_logout( struct im_connection *ic, int allow_reconnect );
 
-/* dialogs.c */
-G_MODULE_EXPORT void do_ask_dialog( struct im_connection *ic, char *msg, void *data, void *doit, void *dont );
-
-/* list.c */
-G_MODULE_EXPORT void add_buddy( struct im_connection *ic, char *group, char *handle, char *realname );
-G_MODULE_EXPORT struct buddy *find_buddy( struct im_connection *ic, char *handle );
-G_MODULE_EXPORT void signoff_blocked( struct im_connection *ic );
-
-G_MODULE_EXPORT void serv_buddy_rename( struct im_connection *ic, char *handle, char *realname );
-
-/* buddy_chat.c */
+/* Communicating with the user. */
+G_MODULE_EXPORT void imcb_log( struct im_connection *ic, char *format, ... );
+G_MODULE_EXPORT void imcb_error( struct im_connection *ic, char *format, ... );
+G_MODULE_EXPORT void imcb_ask( struct im_connection *ic, char *msg, void *data, void *doit, void *dont );
+G_MODULE_EXPORT void imcb_ask_add( struct im_connection *ic, char *handle, const char *realname );
+
+/* Groupchats */
 G_MODULE_EXPORT void add_chat_buddy( struct groupchat *b, char *handle );
 G_MODULE_EXPORT void remove_chat_buddy( struct groupchat *b, char *handle, char *reason );
-
-/* prpl.c */
-G_MODULE_EXPORT void show_got_added( struct im_connection *ic, char *handle, const char *realname );
-
-/* server.c */
-G_MODULE_EXPORT void serv_got_update( struct im_connection *ic, char *handle, int loggedin, int evil, time_t signon, time_t idle, int type, guint caps );
-G_MODULE_EXPORT void serv_got_im( struct im_connection *ic, char *handle, char *msg, guint32 flags, time_t mtime, gint len );
-G_MODULE_EXPORT void serv_got_typing( struct im_connection *ic, char *handle, int timeout, int type );
 G_MODULE_EXPORT void serv_got_chat_invite( struct im_connection *ic, char *handle, char *who, char *msg, GList *data );
 G_MODULE_EXPORT struct groupchat *serv_got_joined_chat( struct im_connection *ic, char *handle );
 G_MODULE_EXPORT void serv_got_chat_in( struct groupchat *c, char *who, int whisper, char *msg, time_t mtime );
 G_MODULE_EXPORT void serv_got_chat_left( struct groupchat *c );
-
 struct groupchat *chat_by_channel( char *channel );
 struct groupchat *chat_by_id( int id );
 
+/* Buddy management */
+G_MODULE_EXPORT void add_buddy( struct im_connection *ic, char *group, char *handle, char *realname );
+G_MODULE_EXPORT struct buddy *find_buddy( struct im_connection *ic, char *handle );
+G_MODULE_EXPORT void serv_buddy_rename( struct im_connection *ic, char *handle, char *realname );
+
+/* Buddy activity */
+G_MODULE_EXPORT void serv_got_update( struct im_connection *ic, char *handle, int loggedin, int evil, time_t signon, time_t idle, int type, guint caps );
+G_MODULE_EXPORT void serv_got_im( struct im_connection *ic, char *handle, char *msg, guint32 flags, time_t mtime, gint len );
+G_MODULE_EXPORT void serv_got_typing( struct im_connection *ic, char *handle, int timeout, int type );
+
+/* Actions, or whatever. */
+int imc_set_away( struct im_connection *ic, char *away );
+int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
+int imc_chat_msg( struct groupchat *c, char *msg, int flags );
+
+void imc_add_allow( struct im_connection *ic, char *handle );
+void imc_rem_allow( struct im_connection *ic, char *handle );
+void imc_add_block( struct im_connection *ic, char *handle );
+void imc_rem_block( struct im_connection *ic, char *handle );
+
+/* Misc. stuff */
+char *set_eval_away_devoice( set_t *set, char *value );
+gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
+void cancel_auto_reconnect( struct account *a );
+
 #endif

protocols/oscar/chat.c

@@ -54 +54 @@
                         continue;
                 if (!cur->priv) {
-                        imc_error(sess->aux_data, "chat connection with no name!");
+                        imcb_error(sess->aux_data, "chat connection with no name!");
                         continue;
                 }
@@ -397 +397 @@
 
         if (detaillevel != 0x02) {
-                imc_error(sess->aux_data, "Only detaillevel 0x2 is support at the moment");
+                imcb_error(sess->aux_data, "Only detaillevel 0x2 is support at the moment");
                 return 1;
         }
@@ -615 +615 @@
 
         if (channel != 0x0003) {
-                imc_error(sess->aux_data, "unknown channel!");
+                imcb_error(sess->aux_data, "unknown channel!");
                 return 0;
         }

protocols/oscar/chatnav.c

@@ -286 +286 @@
 
         if (!(bigblock = aim_gettlv(tlvlist, 0x0004, 1))) {
-                imc_error(sess->aux_data, "no bigblock in top tlv in create room response");
+                imcb_error(sess->aux_data, "no bigblock in top tlv in create room response");
         
                 aim_freetlvchain(&tlvlist);
@@ -301 +301 @@
 
         if (detaillevel != 0x02) {
-                imc_error(sess->aux_data, "unknown detaillevel in create room response");
+                imcb_error(sess->aux_data, "unknown detaillevel in create room response");
                 aim_freetlvchain(&tlvlist);
                 g_free(ck);
@@ -367 +367 @@
 
         if (!(snac2 = aim_remsnac(sess, snac->id))) {
-                imc_error(sess->aux_data, "received response to unknown request!");
+                imcb_error(sess->aux_data, "received response to unknown request!");
                 return 0;
         }
 
         if (snac2->family != 0x000d) {
-                imc_error(sess->aux_data, "recieved response that maps to corrupt request!");
+                imcb_error(sess->aux_data, "recieved response that maps to corrupt request!");
                 return 0;
         }
@@ -389 +389 @@
                 ret = parseinfo_create(sess, mod, rx, snac, bs, snac2);
         else
-                imc_error(sess->aux_data, "unknown request subtype");
+                imcb_error(sess->aux_data, "unknown request subtype");
 
         if (snac2)

protocols/oscar/icq.c

@@ -240 +240 @@
         if (!(tl = aim_readtlvchain(bs)) || !(datatlv = aim_gettlv(tl, 0x0001, 1))) {
                 aim_freetlvchain(&tl);
-                imc_error(sess->aux_data, "corrupt ICQ response\n");
+                imcb_error(sess->aux_data, "corrupt ICQ response\n");
                 return 0;
         }

protocols/oscar/im.c

@@ -937 +937 @@
 
         if (channel != 0x01) {
-                imc_error(sess->aux_data, "icbm: ICBM recieved on unsupported channel.  Ignoring.");
+                imcb_error(sess->aux_data, "icbm: ICBM recieved on unsupported channel.  Ignoring.");
                 return 0;
         }
@@ -1345 +1345 @@
 
                 } else {
-                        // imc_error(sess->aux_data, "Unknown TLV encountered");
+                        // imcb_error(sess->aux_data, "Unknown TLV encountered");
                 }
 
@@ -1517 +1517 @@
         cookie2 = aimbs_getraw(&bbs, 8);
         if (memcmp(cookie, cookie2, 8) != 0) 
-                imc_error(sess->aux_data, "rend: warning cookies don't match!");
+                imcb_error(sess->aux_data, "rend: warning cookies don't match!");
         memcpy(args.cookie, cookie2, 8);
         g_free(cookie2);
@@ -1783 +1783 @@
         } else {
 
-                imc_error(sess->aux_data, "ICBM received on an unsupported channel.  Ignoring.");
+                imcb_error(sess->aux_data, "ICBM received on an unsupported channel.  Ignoring.");
 
                 return 0;

protocols/oscar/info.c

@@ -474 +474 @@
                          */
 #ifdef DEBUG
-                        // imc_error(sess->aux_data, G_STRLOC);
+                        // imcb_error(sess->aux_data, G_STRLOC);
 #endif
 
@@ -635 +635 @@
 
         if (!origsnac || !origsnac->data) {
-                imc_error(sess->aux_data, "major problem: no snac stored!");
+                imcb_error(sess->aux_data, "major problem: no snac stored!");
                 return 0;
         }
@@ -644 +644 @@
                         (inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
                         (inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
-                imc_error(sess->aux_data, "unknown infotype in request!");
+                imcb_error(sess->aux_data, "unknown infotype in request!");
                 return 0;
         }

protocols/oscar/oscar.c

@@ -267 +267 @@
                         if ((conn->type == AIM_CONN_TYPE_BOS) ||
                                    !(aim_getconn_type(odata->sess, AIM_CONN_TYPE_BOS))) {
-                                imc_error(ic, _("Disconnected."));
+                                imcb_error(ic, _("Disconnected."));
                                 imc_logout(ic, TRUE);
                         } else if (conn->type == AIM_CONN_TYPE_CHAT) {
@@ -277 +277 @@
                                 c->fd = -1;
                                 aim_conn_kill(odata->sess, &conn);
-                                imc_error(sess->aux_data, _("You have been disconnected from chat room %s."), c->name);
+                                imcb_error(sess->aux_data, _("You have been disconnected from chat room %s."), c->name);
                         } else if (conn->type == AIM_CONN_TYPE_CHATNAV) {
                                 if (odata->cnpa > 0)
@@ -288 +288 @@
                                                 g_slist_remove(odata->create_rooms, cr);
                                         g_free(cr);
-                                        imc_error(sess->aux_data, _("Chat is currently unavailable"));
+                                        imcb_error(sess->aux_data, _("Chat is currently unavailable"));
                                 }
                                 aim_conn_kill(odata->sess, &conn);
@@ -325 +325 @@
 
         if (source < 0) {
-                imc_error(ic, _("Couldn't connect to host"));
+                imcb_error(ic, _("Couldn't connect to host"));
                 imc_logout(ic, TRUE);
                 return FALSE;
@@ -353 +353 @@
         aim_session_t *sess;
         aim_conn_t *conn;
-        struct im_connection *ic = imc_new(acc);
+        struct im_connection *ic = imcb_new(acc);
         struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
 
@@ -380 +380 @@
         conn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, NULL);
         if (conn == NULL) {
-                imc_error(ic, _("Unable to login to AIM"));
+                imcb_error(ic, _("Unable to login to AIM"));
                 imc_logout(ic, TRUE);
                 return;
@@ -386 +386 @@
         
         if (acc->server == NULL) {
-                imc_error(ic, "No servername specified");
+                imcb_error(ic, "No servername specified");
                 imc_logout(ic, FALSE);
                 return;
@@ -393 +393 @@
         if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
             g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
-                imc_log(ic, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
-        }
-        
-        imc_log(ic, _("Signon: %s"), ic->acc->user);
+                imcb_log(ic, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
+        }
+        
+        imcb_log(ic, _("Signon: %s"), ic->acc->user);
 
         aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0);
@@ -404 +404 @@
         conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, ic);
         if (conn->fd < 0) {
-                imc_error(ic, _("Couldn't connect to host"));
+                imcb_error(ic, _("Couldn't connect to host"));
                 imc_logout(ic, TRUE);
                 return;
@@ -464 +464 @@
 
         if (source < 0) {
-                imc_error(ic, _("Could Not Connect"));
+                imcb_error(ic, _("Could Not Connect"));
                 imc_logout(ic, TRUE);
                 return FALSE;
@@ -472 +472 @@
         ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
                         oscar_callback, bosconn);
-        imc_log(ic, _("Connection established, cookie sent"));
+        imcb_log(ic, _("Connection established, cookie sent"));
         
         return FALSE;
@@ -495 +495 @@
                 case 0x05:
                         /* Incorrect nick/password */
-                        imc_error(ic, _("Incorrect nickname or password."));
+                        imcb_error(ic, _("Incorrect nickname or password."));
 //                      plugin_event(event_error, (void *)980, 0, 0, 0);
                         break;
                 case 0x11:
                         /* Suspended account */
-                        imc_error(ic, _("Your account is currently suspended."));
+                        imcb_error(ic, _("Your account is currently suspended."));
                         break;
                 case 0x18:
                         /* connecting too frequently */
-                        imc_error(ic, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
+                        imcb_error(ic, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
                         break;
                 case 0x1c:
                         /* client too old */
-                        imc_error(ic, _("The client version you are using is too old. Please upgrade at " WEBSITE));
+                        imcb_error(ic, _("The client version you are using is too old. Please upgrade at " WEBSITE));
                         break;
                 default:
-                        imc_error(ic, _("Authentication Failed"));
+                        imcb_error(ic, _("Authentication Failed"));
                         break;
                 }
@@ -523 +523 @@
         bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, NULL);
         if (bosconn == NULL) {
-                imc_error(ic, _("Internal Error"));
+                imcb_error(ic, _("Internal Error"));
                 od->killme = TRUE;
                 return 0;
@@ -569 +569 @@
         g_free(host);
         if (bosconn->fd < 0) {
-                imc_error(ic, _("Could Not Connect"));
+                imcb_error(ic, _("Could Not Connect"));
                 od->killme = TRUE;
                 return 0;
@@ -607 +607 @@
         }
         if (in != '\n') {
-                imc_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
+                imcb_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
                                 " You may be disconnected shortly.");
                 b_event_remove(pos->inpa);
@@ -630 +630 @@
 
         if (source < 0) {
-                imc_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
+                imcb_error(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
                                 " You may be disconnected shortly.");
                 if (pos->modname)
@@ -708 +708 @@
                         g_free(pos->modname);
                 g_free(pos);
-                imc_error(sess->aux_data, "Gaim was unable to get a valid hash for logging into AIM."
+                imcb_error(sess->aux_data, "Gaim was unable to get a valid hash for logging into AIM."
                                 " You may be disconnected shortly.");
         }
@@ -1112 +1112 @@
                 inv->name = g_strdup(name);
                 
-                do_ask_dialog( ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
+                imcb_ask( ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
         
                 if (name)
@@ -1130 +1130 @@
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
         if(find_buddy(data->ic, uin) == NULL)
-                show_got_added(data->ic, uin, NULL);
+                imcb_ask_add(data->ic, uin, NULL);
         
         g_free(uin);
@@ -1164 +1164 @@
         data->ic = ic;
         data->uin = uin;
-        do_ask_dialog(ic, dialog_msg, data, gaim_icq_authgrant, gaim_icq_authdeny);
+        imcb_ask(ic, dialog_msg, data, gaim_icq_authgrant, gaim_icq_authdeny);
         g_free(dialog_msg);
 }
@@ -1207 +1207 @@
 
                 case 0x0007: { /* Someone has denied you authorization */
-                        imc_log(sess->aux_data, "The user %u has denied your request to add them to your contact list for the following reason:\n%s", args->uin, args->msg ? args->msg : _("No reason given.") );
+                        imcb_log(sess->aux_data, "The user %u has denied your request to add them to your contact list for the following reason:\n%s", args->uin, args->msg ? args->msg : _("No reason given.") );
                 } break;
 
                 case 0x0008: { /* Someone has granted you authorization */
-                        imc_log(sess->aux_data, "The user %u has granted your request to add them to your contact list for the following reason:\n%s", args->uin, args->msg ? args->msg : _("No reason given.") );
+                        imcb_log(sess->aux_data, "The user %u has granted your request to add them to your contact list for the following reason:\n%s", args->uin, args->msg ? args->msg : _("No reason given.") );
                 } break;
 
@@ -1277 +1277 @@
                 case 0:
                         /* Invalid (0) */
-                        imc_error(sess->aux_data,
+                        imcb_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s because it was invalid.") :
@@ -1286 +1286 @@
                 case 1:
                         /* Message too large */
-                        imc_error(sess->aux_data,
+                        imcb_error(sess->aux_data,
                                    nummissed == 1 ?
                                    _("You missed %d message from %s because it was too large.") :
@@ -1295 +1295 @@
                 case 2:
                         /* Rate exceeded */
-                        imc_error(sess->aux_data,
+                        imcb_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s because the rate limit has been exceeded.") :
@@ -1304 +1304 @@
                 case 3:
                         /* Evil Sender */
-                        imc_error(sess->aux_data,
+                        imcb_error(sess->aux_data,
                                    nummissed == 1 ?
                                    _("You missed %d message from %s because it was too evil.") : 
@@ -1313 +1313 @@
                 case 4:
                         /* Evil Receiver */
-                        imc_error(sess->aux_data,
+                        imcb_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s because you are too evil.") :
@@ -1321 +1321 @@
                         break;
                 default:
-                        imc_error(sess->aux_data,
+                        imcb_error(sess->aux_data,
                                    nummissed == 1 ? 
                                    _("You missed %d message from %s for unknown reasons.") :
@@ -1341 +1341 @@
         va_end(ap);
 
-        imc_error(sess->aux_data, _("SNAC threw error: %s"),
+        imcb_error(sess->aux_data, _("SNAC threw error: %s"),
                   reason < msgerrreasonlen ? msgerrreason[reason] : "Unknown error");
 
@@ -1357 +1357 @@
         va_end(ap);
 
-        imc_error(sess->aux_data, _("Your message to %s did not get sent: %s"), destn,
+        imcb_error(sess->aux_data, _("Your message to %s did not get sent: %s"), destn,
                         (reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
 
@@ -1373 +1373 @@
         va_end(ap);
 
-        imc_error(sess->aux_data, _("User information for %s unavailable: %s"), destn,
+        imcb_error(sess->aux_data, _("User information for %s unavailable: %s"), destn,
                         (reason < msgerrreasonlen) ? msgerrreason[reason] : _("Reason unknown"));
 
@@ -1390 +1390 @@
 
         if (id < 4)
-                imc_error(sess->aux_data, _("Your connection may be lost."));
+                imcb_error(sess->aux_data, _("Your connection may be lost."));
 
         return 1;
@@ -1584 +1584 @@
                 aim_conn_setlatency(fr->conn, windowsize/4);
         } else if (code == AIM_RATE_CODE_LIMIT) {
-                imc_error(sess->aux_data, _("The last message was not sent because you are over the rate limit. "
+                imcb_error(sess->aux_data, _("The last message was not sent because you are over the rate limit. "
                           "Please wait 10 seconds and try again."));
                 aim_conn_setlatency(fr->conn, windowsize/2);
@@ -1789 +1789 @@
 
                 case 0x0007: { /* Someone has denied you authorization */
-                        imc_log(sess->aux_data, "The user %u has denied your request to add them to your contact list for the following reason:\n%s", msg->sender, msg->msg ? msg->msg : _("No reason given.") );
+                        imcb_log(sess->aux_data, "The user %u has denied your request to add them to your contact list for the following reason:\n%s", msg->sender, msg->msg ? msg->msg : _("No reason given.") );
                 } break;
 
                 case 0x0008: { /* Someone has granted you authorization */
-                        imc_log(sess->aux_data, "The user %u has granted your request to add them to your contact list for the following reason:\n%s", msg->sender, msg->msg ? msg->msg : _("No reason given.") );
+                        imcb_log(sess->aux_data, "The user %u has granted your request to add them to your contact list for the following reason:\n%s", msg->sender, msg->msg ? msg->msg : _("No reason given.") );
                 } break;
 
@@ -1906 +1906 @@
 
         if (od->rights.maxawaymsglen == 0)
-                imc_error(ic, "oscar_set_away_aim called before locate rights received");
+                imcb_error(ic, "oscar_set_away_aim called before locate rights received");
 
         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
@@ -1920 +1920 @@
 
         if (strlen(message) > od->rights.maxawaymsglen) {
-                imc_error(ic, "Maximum away message length of %d bytes exceeded, truncating", od->rights.maxawaymsglen);
+                imcb_error(ic, "Maximum away message length of %d bytes exceeded, truncating", od->rights.maxawaymsglen);
         }
 
@@ -2084 +2084 @@
         
         /* Now that we have a buddy list, we can tell BitlBee that we're online. */
-        imc_connected(ic);
+        imcb_connected(ic);
         
         return 1;
@@ -2106 +2106 @@
                 {
                         /* Hmm, the length should be even... */
-                        imc_error( sess->aux_data, "Received SSI ACK package with non-even length");
+                        imcb_error( sess->aux_data, "Received SSI ACK package with non-even length");
                         return( 0 );
                 }
@@ -2117 +2117 @@
                         if( st == 0x0E )
                         {
-                                imc_log( sess->aux_data, "Buddy %s can't be added without authorization, requesting authorization", list );
+                                imcb_log( sess->aux_data, "Buddy %s can't be added without authorization, requesting authorization", list );
                                 
                                 aim_ssi_auth_request( sess, fr->conn, list, "" );
@@ -2303 +2303 @@
         }
 
-                imc_log(ic, "%s\n%s", _("User Info"), str->str);
+                imcb_log(ic, "%s\n%s", _("User Info"), str->str);
         g_string_free(str, TRUE);
 
@@ -2397 +2397 @@
                         idletime.tm_sec = 0;
                         strftime(buff, 256, _("%d days %H hours %M minutes"), &idletime);
-                        imc_log(ic, "%s: %s", _("Idle Time"), buff);
+                        imcb_log(ic, "%s: %s", _("Idle Time"), buff);
                 }
                 
                 if(text) {
                         utf8 = oscar_encoding_to_utf8(extracted_encoding, text, text_length);
-                        imc_log(ic, "%s\n%s", _("User Info"), utf8);
+                        imcb_log(ic, "%s\n%s", _("User Info"), utf8);
                 } else {
-                        imc_log(ic, _("No user info available."));
+                        imcb_log(ic, _("No user info available."));
                 }
         } else if(infotype == AIM_GETINFO_AWAYMESSAGE && userinfo->flags & AIM_FLAG_AWAY) {
                 utf8 = oscar_encoding_to_utf8(extracted_encoding, text, text_length);
-                imc_log(ic, "%s\n%s", _("Away Message"), utf8);
+                imcb_log(ic, "%s\n%s", _("Away Message"), utf8);
         }
 

protocols/oscar/rxqueue.c

@@ -392 +392 @@
                 aim_bstream_rewind(&flaphdr);
                 start = aimbs_get8(&flaphdr);
-                imc_error(sess->aux_data, "FLAP framing disrupted");
+                imcb_error(sess->aux_data, "FLAP framing disrupted");
                 aim_conn_close(conn);
                 return -1;

protocols/oscar/search.c

@@ -39 +39 @@
         /* XXX the modules interface should have already retrieved this for us */
         if (!(snac2 = aim_remsnac(sess, snac->id))) {
-                imc_error(sess->aux_data, "couldn't get snac");
+                imcb_error(sess->aux_data, "couldn't get snac");
                 return 0;
         }

protocols/oscar/service.c

@@ -567 +567 @@
                 group = aimbs_get16(bs);
 
-                imc_error(sess->aux_data, "bifurcated migration unsupported");
+                imcb_error(sess->aux_data, "bifurcated migration unsupported");
         }
 
@@ -894 +894 @@
 */
                 } else
-                        imc_error(sess->aux_data, "WARNING: unknown hash request");
+                        imcb_error(sess->aux_data, "WARNING: unknown hash request");
 
         }

protocols/oscar/txqueue.c

@@ -30 +30 @@
 
         if (!conn) {
-                imc_error(sess->aux_data, "no connection specified");
+                imcb_error(sess->aux_data, "no connection specified");
                 return NULL;
         }
@@ -46 +46 @@
 
         } else 
-                imc_error(sess->aux_data, "unknown framing");
+                imcb_error(sess->aux_data, "unknown framing");
 
         if (datalen > 0) {
@@ -80 +80 @@
 
         if (!fr->conn) {
-                imc_error(sess->aux_data, "WARNING: enqueueing packet with no connection");
+                imcb_error(sess->aux_data, "WARNING: enqueueing packet with no connection");
                 fr->conn = aim_getconn_type(sess, AIM_CONN_TYPE_BOS);
         }
@@ -120 +120 @@
 
         if (!fr->conn) {
-                imc_error(sess->aux_data, "packet has no connection");
+                imcb_error(sess->aux_data, "packet has no connection");
                 aim_frame_destroy(fr);
                 return 0;

protocols/yahoo/yahoo.c

@@ -123 +123 @@
 static void byahoo_login( account_t *acc )
 {
-        struct im_connection *ic = imc_new( acc );
+        struct im_connection *ic = imcb_new( acc );
         struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -129 +129 @@
         yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        imc_log( ic, "Connecting" );
+        imcb_log( ic, "Connecting" );
         yd->y2_id = yahoo_init( acc->user, acc->pass );
         yahoo_login( yd->y2_id, yd->current_status );
@@ -163 +163 @@
 {
         /* Just make an URL and let the user fetch the info */
-        imc_log(ic, "%s\n%s: %s%s", _("User Info"), 
+        imcb_log(ic, "%s\n%s: %s%s", _("User Info"), 
                         _("For now, fetch yourself"), yahoo_get_profile_url(),
                         who);
@@ -510 +510 @@
         if( succ == YAHOO_LOGIN_OK )
         {
-                imc_connected( ic );
+                imcb_connected( ic );
                 
                 yd->logged_in = TRUE;
@@ -538 +538 @@
                 
                 if( url && *url )
-                        imc_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
+                        imcb_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
                 else
-                        imc_error( ic, "Error %d (%s)", succ, errstr );
+                        imcb_error( ic, "Error %d (%s)", succ, errstr );
                 
                 imc_logout( ic, allow_reconnect );
@@ -605 +605 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
+        imcb_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
 }
 
@@ -625 +625 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Yahoo! system message: %s", msg );
+        imcb_log( ic, "Yahoo! system message: %s", msg );
 }
 
@@ -632 +632 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
+        imcb_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
 }
 
@@ -639 +639 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_error( ic, "%s", err );
+        imcb_error( ic, "%s", err );
         
         if( fatal )
@@ -803 +803 @@
         g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", room, who, msg );
         
-        do_ask_dialog( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
+        imcb_ask( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
 }
 
@@ -810 +810 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
+        imcb_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
 }
 
@@ -893 +893 @@
         
         if( from && subj )
-                imc_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
+                imcb_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
         else if( cnt > 0 )
-                imc_log( ic, "Received %d new e-mails", cnt );
+                imcb_log( ic, "Received %d new e-mails", cnt );
 }