Changeset ccc595b

Timestamp:

2010-07-24T13:04:00Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c495217

Parents:

78e2eb7

Message:

Support buddy groups on Yahoo!

File:

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

protocols/yahoo/yahoo.c

@@ -271 +271 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        
-        yahoo_add_buddy( yd->y2_id, who, group ? group : BYAHOO_DEFAULT_GROUP, NULL );
+        bee_user_t *bu;
+        
+        if( group && ( bu = bee_user_by_handle( ic->bee, ic, who ) ) && bu->group )
+        {
+                GSList *bgl;
+                
+                /* If the person is in our list already, this is a group change. */
+                yahoo_change_buddy_group( yd->y2_id, who, bu->group->name, group );
+                
+                /* No idea how often people have people in multiple groups and
+                   BitlBee doesn't currently support this anyway .. but keep
+                   this struct up-to-date for now. */
+                for( bgl = yd->buddygroups; bgl; bgl = bgl->next )
+                {
+                        struct byahoo_buddygroups *bg = bgl->data;
+                        
+                        if( g_strcasecmp( bg->buddy, who ) == 0 &&
+                            g_strcasecmp( bg->group, bu->group->name ) == 0 )
+                        {
+                                g_free( bg->group );
+                                bg->group = g_strdup( group );
+                        }
+                }
+        }
+        else
+                yahoo_add_buddy( yd->y2_id, who, group ? group : BYAHOO_DEFAULT_GROUP, NULL );
 }
 
@@ -780 +804 @@
                                        const char *old_group, const char *new_group )
 {
-}                                
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_add_buddy( ic, who, new_group );
+}
 
 /* Because we don't want asynchronous connects in BitlBee, and because
@@ -981 +1008 @@
 }
 
-void ext_yahoo_got_ping( int id, const char *msg)
+void ext_yahoo_got_ping( int id, const char *msg )
 {
 }