Changeset 84b045d for protocols/yahoo/yahoo.c

Timestamp:

2007-04-16T01:03:08Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6bbb939

Parents:

c2fb3809

Message:

s/imc/imcb/ for callback functions. Moved things aroundin nogaim.h a
little bit, grouping things by category instead of original Gaim 0.58
filename.

File:

• protocols/yahoo/yahoo.c (modified) (12 diffs)

protocols/yahoo/yahoo.c

@@ -123 +123 @@
 static void byahoo_login( account_t *acc )
 {
-        struct im_connection *ic = imc_new( acc );
+        struct im_connection *ic = imcb_new( acc );
         struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 );
         
@@ -129 +129 @@
         yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        imc_log( ic, "Connecting" );
+        imcb_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 */
-        imc_log(ic, "%s\n%s: %s%s", _("User Info"), 
+        imcb_log(ic, "%s\n%s: %s%s", _("User Info"), 
                         _("For now, fetch yourself"), yahoo_get_profile_url(),
                         who);
@@ -510 +510 @@
         if( succ == YAHOO_LOGIN_OK )
         {
-                imc_connected( ic );
+                imcb_connected( ic );
                 
                 yd->logged_in = TRUE;
@@ -538 +538 @@
                 
                 if( url && *url )
-                        imc_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
+                        imcb_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
                 else
-                        imc_error( ic, "Error %d (%s)", succ, errstr );
+                        imcb_error( ic, "Error %d (%s)", succ, errstr );
                 
                 imc_logout( ic, allow_reconnect );
@@ -605 +605 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
+        imcb_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
 }
 
@@ -625 +625 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Yahoo! system message: %s", msg );
+        imcb_log( ic, "Yahoo! system message: %s", msg );
 }
 
@@ -632 +632 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
+        imcb_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
 }
 
@@ -639 +639 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_error( ic, "%s", err );
+        imcb_error( ic, "%s", err );
         
         if( fatal )
@@ -803 +803 @@
         g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", room, who, msg );
         
-        do_ask_dialog( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
+        imcb_ask( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
 }
 
@@ -810 +810 @@
         struct im_connection *ic = byahoo_get_ic_by_id( id );
         
-        imc_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
+        imcb_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
 }
 
@@ -893 +893 @@
         
         if( from && subj )
-                imc_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
+                imcb_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
         else if( cnt > 0 )
-                imc_log( ic, "Received %d new e-mails", cnt );
+                imcb_log( ic, "Received %d new e-mails", cnt );
 }