Changeset f0cb961 for protocols/yahoo

Timestamp:

2007-04-19T06:03:43Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d323394c

Parents:

33dc261

Message:

More API changes: buddy list management. imcb_add_buddy() is now a *real*
callback, it's only called from inside IM-modules. This makes sure a buddy
only gets added to the BitlBee structures if the add was successful. This
gets rid of the weirdness described in #55. Unfortunately for now this
change breaks A) automatic renaming of ICQ contacts (if there are names
stored in the contact list) B) add -tmp.

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (1 diff)
• yahoo.c (modified) (2 diffs)

protocols/yahoo/libyahoo2.c

@@ -2403 +2403 @@
                 where = "Unknown";
 
-        bud = y_new0(struct yahoo_buddy, 1);
-        bud->id = strdup(who);
-        bud->group = strdup(where);
-        bud->real_name = NULL;
-
-        yd->buddies = y_list_append(yd->buddies, bud);
+        /* status: 0 == Successful, 1 == Error (does not exist), 2 == Already in list */
+        if( status == 0 ) {
+                bud = y_new0(struct yahoo_buddy, 1);
+                bud->id = strdup(who);
+                bud->group = strdup(where);
+                bud->real_name = NULL;
+                
+                yd->buddies = y_list_append(yd->buddies, bud);
+                
+                /* Possibly called already, but at least the call above doesn't
+                   seem to happen every time (not anytime I tried). */
+                YAHOO_CALLBACK(ext_yahoo_contact_added)(yd->client_id, me, who, NULL);
+        }
 
 /*      YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, status, NULL, (status==YAHOO_STATUS_AVAILABLE?0:1)); */

protocols/yahoo/yahoo.c

@@ -532 +532 @@
                 }
                 
-                add_buddy( ic, b->group, b->id, b->real_name );
+                imcb_add_buddy( ic, b->id, b->group );
+                imcb_rename_buddy( ic, b->id, b->real_name );
+                
                 bl = bl->next;
         }
@@ -904 +906 @@
 void ext_yahoo_contact_added( int id, const char *myid, const char *who, const char *msg )
 {
+        /* Groups schmoups. If I want to handle groups properly I can get the
+           buddy data from some internal libyahoo2 structure. */
+        imcb_add_buddy( byahoo_get_ic_by_id( id ), (char*) who, NULL );
 }