adium 2269:7f92b8b3ab5d: Fixed opening bookmarks through the sta...
commits at adium.im
commits at adium.im
Thu May 21 19:11:12 UTC 2009
details: http://hg.adium.im/adium/rev/7f92b8b3ab5d
revision: 2269:7f92b8b3ab5d
author: Zachary West <zacw at adium.im>
date: Thu May 21 15:11:07 2009 -0400
Fixed opening bookmarks through the status menu item's contacts menu. Fixes #12120.
diffstat:
Plugins/Status Menu Item/CBStatusMenuItemController.m | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diffs (26 lines):
diff -r a9d0686f1c49 -r 7f92b8b3ab5d Plugins/Status Menu Item/CBStatusMenuItemController.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m Thu May 21 15:07:27 2009 -0400
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m Thu May 21 15:11:07 2009 -0400
@@ -31,6 +31,7 @@
#import <Adium/AIAccount.h>
#import <Adium/AIChat.h>
#import <Adium/AIListContact.h>
+#import <Adium/AIListBookmark.h>
#import <Adium/AIStatusIcons.h>
#import <Adium/AIContactHidingController.h>
#import <AIUtilities/AIColorAdditions.h>
@@ -530,8 +531,13 @@
*/
- (void)contactMenu:(AIContactMenu *)inContactMenu didSelectContact:(AIListContact *)inContact
{
- [adium.interfaceController setActiveChat:[adium.chatController openChatWithContact:inContact
+ if ([inContact isMemberOfClass:[AIListBookmark class]]) {
+ [(AIListBookmark *)inContact openChat];
+ } else {
+ [adium.interfaceController setActiveChat:[adium.chatController openChatWithContact:inContact
onPreferredAccount:YES]];
+ }
+
[self activateAdium];
}
More information about the commits
mailing list