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

protocols/msn/msn.c

@@ -39 +39 @@
 static void msn_login( account_t *acc )
 {
-        struct im_connection *ic = new_gaim_conn( acc );
+        struct im_connection *ic = imc_new( acc );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
@@ -47 +47 @@
         if( strchr( acc->user, '@' ) == NULL )
         {
-                hide_login_progress( ic, "Invalid account name" );
-                signoff( ic );
+                imc_error( ic, "Invalid account name" );
+                imc_logout( ic );
                 return;
         }
         
-        set_login_progress( ic, 1, "Connecting" );
+        imc_log( ic, "Connecting" );
         
         md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, ic );
         if( md->fd < 0 )
         {
-                hide_login_progress( ic, "Could not connect to server" );
-                signoff( ic );
+                imc_error( ic, "Could not connect to server" );
+                imc_logout( ic );
                 return;
         }
@@ -96 +96 @@
                                 m = l->data;
                         
-                                serv_got_crap( ic, "Warning: Closing down MSN connection with unsent message to %s, you'll have to resend it.", m->who );
+                                imc_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 */
-        serv_got_crap( ic, "%s\n%s: %s%s", _("User Info"), _("For now, fetch yourself"), PROFILE_URL, who );
+        imc_log( ic, "%s\n%s: %s%s", _("User Info"), _("For now, fetch yourself"), PROFILE_URL, who );
 }
 
@@ -373 +373 @@
         if( strlen( value ) > 129 )
         {
-                serv_got_crap( ic, "Maximum name length exceeded" );
+                imc_log( ic, "Maximum name length exceeded" );
                 return NULL;
         }