# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177654744 0
# Node ID f2332c0da79fc2f0a0ee9a26809656f3cc48592e
# Parent  2ae39a05617978e419b11f3487d1e1ef60c6392f# Parent  f1513338fbdbcfd9855eef45cba2b09852eff513
merge of '2f959ba8a0fdac370ac610e60f6a4cd09525d928'
     and '49b3bf5604009f3f19eee42ccd7b9c061a9109f1'

diff -r 2ae39a056179 -r f2332c0da79f libpurple/blist.c
--- 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) {
diff -r 2ae39a056179 -r f2332c0da79f libpurple/status.c
--- a/libpurple/status.c	Fri Apr 27 05:32:49 2007 +0000
+++ b/libpurple/status.c	Fri Apr 27 06:19:04 2007 +0000
@@ -637,9 +637,6 @@
 
 		g_free(tmp);
 	}
-
-	if (ops != NULL && ops->update != NULL)
-		ops->update(purple_get_blist(), (PurpleBlistNode*)buddy);
 }
 
 static void