Changeset a08e875

Timestamp:

2010-07-17T12:08:31Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a91550c

Parents:

d0527c1

Message:

libpurple: Read group information of contacts.

File:

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

protocols/purple/purple.c

@@ -644 +644 @@
 };
 
-static void prplcb_blist_new( PurpleBlistNode *node )
-{
-        PurpleBuddy *bud = (PurpleBuddy*) node;
-        
+static void prplcb_blist_update( PurpleBuddyList *list, PurpleBlistNode *node )
+{
         if( node->type == PURPLE_BLIST_BUDDY_NODE )
         {
-                struct im_connection *ic = purple_ic_by_pa( bud->account );
-                
-                if( ic == NULL )
-                        return;
-                
-                imcb_add_buddy( ic, bud->name, NULL );
-                if( bud->server_alias )
-                {
-                        imcb_rename_buddy( ic, bud->name, bud->server_alias );
-                        imcb_buddy_nick_hint( ic, bud->name, bud->server_alias );
-                }
-        }
-}
-
-static void prplcb_blist_update( PurpleBuddyList *list, PurpleBlistNode *node )
-{
-        PurpleBuddy *bud = (PurpleBuddy*) node;
-        
-        if( node->type == PURPLE_BLIST_BUDDY_NODE )
-        {
+                PurpleBuddy *bud = (PurpleBuddy*) node;
+                PurpleGroup *group = purple_buddy_get_group( bud );
                 struct im_connection *ic = purple_ic_by_pa( bud->account );
                 PurpleStatus *as;
@@ -680 +660 @@
                         imcb_rename_buddy( ic, bud->name, bud->server_alias );
                 
+                if( group )
+                        imcb_add_buddy( ic, bud->name, purple_group_get_name( group ) );
+                
                 flags |= purple_presence_is_online( bud->presence ) ? OPT_LOGGED_IN : 0;
                 flags |= purple_presence_is_available( bud->presence ) ? 0 : OPT_AWAY;
@@ -691 +674 @@
                                   purple_presence_get_login_time( bud->presence ),
                                   purple_presence_get_idle_time( bud->presence ) );
+        }
+}
+
+static void prplcb_blist_new( PurpleBlistNode *node )
+{
+        if( node->type == PURPLE_BLIST_BUDDY_NODE )
+        {
+                PurpleBuddy *bud = (PurpleBuddy*) node;
+                struct im_connection *ic = purple_ic_by_pa( bud->account );
+                
+                if( ic == NULL )
+                        return;
+                
+                imcb_add_buddy( ic, bud->name, NULL );
+                
+                prplcb_blist_update( NULL, node );
         }
 }