Changeset a91550c for protocols/purple

Timestamp:

2010-07-17T12:29:51Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6ef19f7

Parents:

a08e875

Message:

Try to pass a group when removing a contact. No idea what will happen if
a contact is in multiple groups, for now I'm not supporting it.

Also cleaning up query code to avoid calling NULL.

File:

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

protocols/purple/purple.c

@@ -371 +371 @@
         if( pb != NULL )
         {
-                purple_account_remove_buddy( (PurpleAccount*) ic->proto_data, pb, NULL );
+                PurpleGroup *group;
+                
+                group = purple_buddy_get_group( pb );
+                purple_account_remove_buddy( (PurpleAccount*) ic->proto_data, pb, group );
+                
                 purple_blist_remove_buddy( pb );
         }
@@ -695 +699 @@
 static void prplcb_blist_remove( PurpleBuddyList *list, PurpleBlistNode *node )
 {
-        /*
+/*
         PurpleBuddy *bud = (PurpleBuddy*) node;
         
@@ -707 +711 @@
                 imcb_remove_buddy( ic, bud->name, NULL );
         }
-        */
+*/
 }
 
@@ -828 +832 @@
         struct prplcb_request_action_data *pqad = data;
         
-        pqad->yes( pqad->user_data, pqad->yes_i );
+        if( pqad->yes )
+                pqad->yes( pqad->user_data, pqad->yes_i );
         g_free( pqad );
 }
@@ -836 +841 @@
         struct prplcb_request_action_data *pqad = data;
         
-        pqad->no( pqad->user_data, pqad->no_i );
+        if( pqad->no )
+                pqad->no( pqad->user_data, pqad->no_i );
         g_free( pqad );
 }
@@ -859 +865 @@
                 fn = va_arg( actions, void* );
                 
-                if( strstr( caption, "Accept" ) )
+                if( strstr( caption, "Accept" ) || strstr( caption, "OK" ) )
                 {
                         pqad->yes = fn;