Changeset 5a673f3

Timestamp:

2010-05-09T13:04:45Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dcd16c5

Parents:

47fae0f

Message:

Pick up buddy group information from OSCAR server-side contact list.

File:

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

protocols/oscar/oscar.c

@@ -255 +255 @@
 
         u = t = g_strdup(s);
-
-        strcpy(t, s);
         g_strdown(t);
 
@@ -2090 +2088 @@
 static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
         struct im_connection *ic = sess->aux_data;
-        struct aim_ssi_item *curitem;
+        struct aim_ssi_item *curitem, *curgroup;
         int tmp;
         char *nrm;
@@ -2106 +2104 @@
                                         if (curitem->data && aim_gettlv(curitem->data, 0x0131, 1))
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
-                                                
-                                        imcb_add_buddy(ic, nrm, NULL);
+                                        
+                                        imcb_add_buddy(ic, nrm, curgroup->gid == curitem->gid ? curgroup->name : NULL);
                                         
                                         if (realname) {
@@ -2115 +2113 @@
                                         }
                                 }
+                                break;
+
+                        case 0x0001: /* Group */
+                                curgroup = curitem;
                                 break;