Changeset 42acba1

Timestamp:

2010-07-25T08:54:25Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5588edf5

Parents:

8b01217

Message:

Some support for changing group info on OSCAR.

File:

• protocols/oscar/oscar.c (modified) (2 diffs)

protocols/oscar/oscar.c

@@ -1943 +1943 @@
 static void oscar_add_buddy(struct im_connection *g, char *name, char *group) {
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
-        aim_ssi_addbuddies(odata->sess, odata->conn, OSCAR_GROUP, &name, 1, 0);
+        bee_user_t *bu;
+        
+        if (group && (bu = bee_user_by_handle(g->bee, g, name)) && bu->group)
+                aim_ssi_movebuddy(odata->sess, odata->conn, bu->group->name, group, name);
+        else
+                aim_ssi_addbuddies(odata->sess, odata->conn, group ? : OSCAR_GROUP, &name, 1, 0);
 }
 
@@ -2067 +2072 @@
                 for( i = 0; i < count; i ++ )
                 {
+                        struct aim_ssi_item *ssigroup = aim_ssi_itemlist_findparent( sess->ssi.items, list );
+                        char *group = ssigroup ? ssigroup->name : NULL;
+                        
                         st = aimbs_get16( &fr->data );
                         if( st == 0x00 )
                         {
-                                imcb_add_buddy( sess->aux_data, normalize(list), NULL );
+                                imcb_add_buddy( sess->aux_data, normalize(list), group );
                         }
                         else if( st == 0x0E )