Changeset aef4828 for protocols/msn/sb.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/msn/sb.c (modified) (4 diffs)

protocols/msn/sb.c

@@ -222 +222 @@
                 g_slist_free( sb->msgq );
                 
-                serv_got_crap( ic, "Warning: Closing down MSN switchboard connection with "
+                imc_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 )
         {
-                hide_login_progress_error( ic, "Received an XFR from a switchboard server, unable to comply! This is likely to be a bug, please report it!" );
-                signoff( ic );
+                imc_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 );
                 return( 0 );
         }
@@ -528 +528 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
-                g_snprintf( buf, sizeof( buf ), "Error reported by switchboard server: %s", err->text );
-                do_error_dialog( ic, buf, "MSN" );
+                imc_error( ic, "Error reported by switchboard server: %s", err->text );
                 
                 if( err->flags & STATUS_SB_FATAL )
@@ -538 +537 @@
                 else if( err->flags & STATUS_FATAL )
                 {
-                        signoff( ic );
+                        imc_logout( ic );
                         return 0;
                 }