Changeset aef4828 for protocols/jabber/iq.c

Timestamp:

2007-04-06T05:20:31Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

552e641

Parents:

0da65d5

Message:

More cleanups, mainly in the callbacks. Replaced things like
do_error_dialog() and (set|hide)_login_progress(_error)?() with things
that hopefully make more sense.

Although it's still not really great...

File:

• protocols/jabber/iq.c (modified) (15 diffs)

protocols/jabber/iq.c

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