Fri, 27 Apr 2007 06:19:04 +0000
merge of '95afcaa6bc4d6400690231f4f53d277dc00fd506'
and '76f71be1b6604bb55ac82739529ebbb683e9d385'
--- a/libpurple/blist.c Fri Apr 27 05:32:49 2007 +0000 +++ b/libpurple/blist.c Fri Apr 27 06:19:04 2007 +0000 @@ -2334,7 +2334,6 @@ buddy = (PurpleBuddy *)bnode; if (account == buddy->account) { PurplePresence *presence; - recompute = TRUE; presence = purple_buddy_get_presence(buddy); @@ -2354,8 +2353,14 @@ if (!g_list_find(list, presence)) list = g_list_prepend(list, presence); - if (ops && ops->remove) + if (contact->priority == buddy) + purple_contact_invalidate_priority_buddy(contact); + else + recompute = TRUE; + + if (ops && ops->remove) { ops->remove(purplebuddylist, bnode); + } } } if (recompute) {