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

protocols/yahoo/yahoo.c

@@ -123 +123 @@
 static void byahoo_login( account_t *acc )
 {
-        struct im_connection *ic = new_gaim_conn( acc );
+        struct im_connection *ic = imc_new( acc );
         struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -129 +129 @@
         yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        set_login_progress( ic, 1, "Connecting" );
+        imc_log( ic, "Connecting" );
         yd->y2_id = yahoo_init( acc->user, acc->pass );
         yahoo_login( yd->y2_id, yd->current_status );
@@ -163 +163 @@
 {
         /* Just make an URL and let the user fetch the info */
-        serv_got_crap(ic, "%s\n%s: %s%s", _("User Info"), 
+        imc_log(ic, "%s\n%s: %s%s", _("User Info"), 
                         _("For now, fetch yourself"), yahoo_get_profile_url(),
                         who);
@@ -511 +511 @@
         if( succ == YAHOO_LOGIN_OK )
         {
-                account_online( ic );
+                imc_connected( ic );
                 
                 yd->logged_in = TRUE;
@@ -550 +550 @@
                 
                 if( yd->logged_in )
-                        hide_login_progress_error( ic, s );
+                        imc_error( ic, s );
                 else
-                        hide_login_progress( ic, s );
+                        imc_error( ic, s );
                 
                 g_free( s );
                 
-                signoff( ic );
+                imc_logout( ic );
         }
 }
@@ -619 +619 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        serv_got_crap( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
+        imc_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
 }
 
@@ -639 +639 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        serv_got_crap( ic, "Yahoo! system message: %s", msg );
+        imc_log( ic, "Yahoo! system message: %s", msg );
 }
 
@@ -646 +646 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        serv_got_crap( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
+        imc_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
 }
 
@@ -653 +653 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
+        imc_error( ic, "%s", err );
+        
         if( fatal )
-        {
-                hide_login_progress_error( ic, err );
-                signoff( ic );
-        }
-        else
-        {
-                do_error_dialog( ic, err, "Yahoo! error" );
-        }
+                imc_logout( ic );
 }
 
@@ -829 +824 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        serv_got_crap( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
+        imc_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
 }
 
@@ -912 +907 @@
         
         if( from && subj )
-                serv_got_crap( ic, "Received e-mail message from %s with subject `%s'", from, subj );
+                imc_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
         else if( cnt > 0 )
-                serv_got_crap( ic, "Received %d new e-mails", cnt );
+                imc_log( ic, "Received %d new e-mails", cnt );
 }