Changeset 84b045d for protocols/jabber

Timestamp:

2007-04-16T01:03:08Z (17 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/jabber

Files:

• io.c (modified) (12 diffs)
• iq.c (modified) (15 diffs)
• jabber.c (modified) (5 diffs)
• jabber_util.c (modified) (2 diffs)
• presence.c (modified) (3 diffs)
• sasl.c (modified) (6 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;