Changeset 23857

Timestamp:

06/08/2008 07:26:53 PM (6 months ago)

Author:

zacw

Message:

Move the chat-opening psychic stuff over to the account to deal with the opening, reducing the preference reading, and making it a bit more readable overall. Refs #8112.

Files:

• trunk/Plugins/Purple Service/adiumPurpleSignals.m (modified) (2 diffs)
• trunk/Plugins/Purple Service/CBPurpleAccount.h (modified) (1 diff)
• trunk/Plugins/Purple Service/CBPurpleAccount.m (modified) (5 diffs)

trunk/Plugins/Purple Service/adiumPurpleSignals.m

@@ -16 +16 @@
-
-#import "adiumPurpleSignals.h"
-#import "AIDualWindowInterfacePlugin.h"
-#import <AIUtilities/AIObjectAdditions.h>
-#import <AIUtilities/AIAttributedStringAdditions.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
-#import <Adium/AIChatControllerProtocol.h>
-#import <Adium/AIInterfaceControllerProtocol.h>
-#import <Adium/AIContentControllerProtocol.h>
-#import <Adium/AIChat.h>
-#import <Adium/AIListContact.h>
@@ -284 +280 @@
-        AIChat *chat = [[[AIObject sharedAdiumInstance] chatController] chatWithContact:contact];
-
-        if ((typingState == AITyping) && 
-                ([[[[AIObject sharedAdiumInstance] preferenceController] preferenceForKey:KEY_PSYCHIC
-                                                                                                                                                   group:PREF_GROUP_DUAL_WINDOW_INTERFACE] boolValue]) &&
-                (![chat isOpen])) {
-                
-                [[[AIObject sharedAdiumInstance] interfaceController] openChat:chat];
-        
-                /*
-                 * Use the Libpurple "psychic" tagline. If this is found to be confusing, we should switch to your own version.
-                 * The upside of using theirs is that clever gimmicky translations already exist.
-                 */
-                AIContentStatus *statusMessage = [AIContentStatus statusInChat:chat
-                                                                                                                        withSource:contact
-                                                                                                                   destination:account
-                                                                                                                                  date:[NSDate date]
-                                                                                                                           message:[NSAttributedString stringWithString:[NSString stringWithUTF8String:_("You feel a disturbance in the force...")]]
-                                                                                                                          withType:@"psychic"];
-                
-                [[[AIObject sharedAdiumInstance] contentController] receiveContentObject:statusMessage];
-        }
-        
-        [account typingUpdateForIMChat:chat typing:[NSNumber numberWithInt:typingState]];
-}

trunk/Plugins/Purple Service/CBPurpleAccount.h

@@ -41 +41 @@
-        BOOL                            deletePurpleAccountAfterDisconnecting;
-        BOOL                            finishedConnectProcess;
+        BOOL                            openPsychicChats;
-
-        PurpleConnectionError lastDisconnectionReason;

trunk/Plugins/Purple Service/CBPurpleAccount.m

@@ -42 +42 @@
-#import <Adium/AIStatusControllerProtocol.h>
-#import <Adium/AIPreferenceControllerProtocol.h>
+#import <Adium/AIContentStatus.h>
-#import <AIUtilities/AIAttributedStringAdditions.h>
-#import <AIUtilities/AIDictionaryAdditions.h>
@@ -56 +57 @@
-#import "AMPurpleTuneTooltip.h"
-#import "adiumPurpleRequest.h"
+#import "AIDualWindowInterfacePlugin.h"
-
-#import "ESMSNService.h" //why oh why must the superclass know about MSN specific things!?
@@ -2688 +2690 @@
-        //Observe preferences changes
-        [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_ALIASES];
+        [[adium preferenceController] registerPreferenceObserver:self forGroup:PREF_GROUP_DUAL_WINDOW_INTERFACE];
-}
-
@@ -2862 +2865 @@
-                }
-        }
+        
+        if ([group isEqualToString:PREF_GROUP_DUAL_WINDOW_INTERFACE]) {
+                openPsychicChats = [[prefDict objectForKey:KEY_PSYCHIC] boolValue];
+        }
-}
-
@@ -2941 +2948 @@
-    AITypingState currentTypingState = [chat integerValueForProperty:KEY_TYPING];
-        AITypingState newTypingState = [typingStateNumber intValue];
-
+
-    if (currentTypingState != newTypingState) {
+                if (newTypingState == AITyping && openPsychicChats && ![chat isOpen]) {
+                        [[adium interfaceController] openChat:chat];
+                        
+                        /*
+                         * Use the Libpurple "psychic" tagline. If this is found to be confusing, we should switch to your own version.
+                         * The upside of using theirs is that clever gimmicky translations already exist.
+                         */
+                        AIContentStatus *statusMessage = [AIContentStatus statusInChat:chat
+                                                                                                                                withSource:[chat listObject]
+                                                                                                                           destination:self
+                                                                                                                                          date:[NSDate date]
+                                                                                                                                   message:[NSAttributedString stringWithString:[NSString stringWithUTF8String:_("You feel a disturbance in the force...")]]
+                                                                                                                                  withType:@"psychic"];
+                        
+                        [[adium contentController] receiveContentObject:statusMessage];
+                }
+                
-                [chat setValue:(newTypingState ? typingStateNumber : nil)
-                                           forProperty:KEY_TYPING