adium-1.4 3379:ea587caf94d5: Update status icons for bookmarks t...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/ea587caf94d5
revision:	3379:ea587caf94d5
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Feb 05 22:12:10 2011 -0500

Update status icons for bookmarks too. Fixes #13221
(transplanted from 5148e836ba209a0567819be635f557f76db09a6b)

diffs (54 lines):

diff -r 602cbf3ce3f1 -r ea587caf94d5 Frameworks/Adium Framework/Source/AIContactObserverManager.m
--- a/Frameworks/Adium Framework/Source/AIContactObserverManager.m	Tue Mar 01 01:47:29 2011 +0100
+++ b/Frameworks/Adium Framework/Source/AIContactObserverManager.m	Sat Feb 05 22:12:10 2011 -0500
@@ -22,6 +22,7 @@
 #import <Adium/AIListContact.h>
 #import <Adium/AIListGroup.h>
 #import <Adium/AIMetaContact.h>
+#import <Adium/AIListBookmark.h>
 #import <Adium/AISortController.h>
 
 #ifdef DEBUG_BUILD
@@ -402,6 +403,12 @@
 	//All contacts
 	[self updateContacts:nil forObserver:inObserver];
 	
+	//All bookmarks
+	for (AIListBookmark *listBookmark in [(AIContactController *)adium.contactController bookmarkEnumerator]) {
+		NSSet	*attributes = [inObserver updateListObject:listBookmark keys:nil silent:YES];
+		if (attributes) [self listObjectAttributesChanged:listBookmark modifiedKeys:attributes];
+	}
+	
     //Reset all groups
 	for (AIListGroup *listGroup in [(AIContactController *)adium.contactController groupEnumerator]) {
 		NSSet	*attributes = [inObserver updateListObject:listGroup keys:nil silent:YES];
diff -r 602cbf3ce3f1 -r ea587caf94d5 Source/AIContactController.h
--- a/Source/AIContactController.h	Tue Mar 01 01:47:29 2011 +0100
+++ b/Source/AIContactController.h	Sat Feb 05 22:12:10 2011 -0500
@@ -49,4 +49,5 @@
 @interface AIContactController (ContactControllerHelperAccess)
 - (NSEnumerator *)contactEnumerator;
 - (NSEnumerator *)groupEnumerator;
+- (NSEnumerator *)bookmarkEnumerator;
 @end
diff -r 602cbf3ce3f1 -r ea587caf94d5 Source/AIContactController.m
--- a/Source/AIContactController.m	Tue Mar 01 01:47:29 2011 +0100
+++ b/Source/AIContactController.m	Sat Feb 05 22:12:10 2011 -0500
@@ -396,7 +396,7 @@
 	}
 	
 	//Restore the grouping of all list bookmarks
-	for (AIListBookmark *bookmark in [self allBookmarks]) {
+	for (AIListBookmark *bookmark in [self bookmarkEnumerator]) {
 		[bookmark restoreGrouping];
 	}
 
@@ -1632,4 +1632,8 @@
 {
 	return [groupDict objectEnumerator];
 }
+- (NSEnumerator *)bookmarkEnumerator
+{
+	return [bookmarkDict objectEnumerator];
+}
 @end