Changeset aef4828 for protocols/jabber/io.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/io.c (modified) (14 diffs)

protocols/jabber/io.c

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