adium 4047:44d9b05bb911: Backout of changeset 3345 for stay-in-c...
commits at adium.im
commits at adium.im
Tue Jul 12 23:35:11 UTC 2011
details: http://hg.adium.im/adium/rev/44d9b05bb911
revision: 4047:44d9b05bb911
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Wed Jul 13 00:59:36 2011 +0200
Backout of changeset 3345 for stay-in-chat-removal.
Subject: adium 4048:28dbbe73b40b: Backout of changeset 3344 for stay-in-chat-removal.
details: http://hg.adium.im/adium/rev/28dbbe73b40b
revision: 4048:28dbbe73b40b
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Wed Jul 13 01:28:24 2011 +0200
Backout of changeset 3344 for stay-in-chat-removal.
diffs (616 lines):
diff -r 14685b7a7900 -r 28dbbe73b40b Frameworks/Adium Framework/Source/AIContactControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIContactControllerProtocol.h Sat Jul 02 23:05:52 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIContactControllerProtocol.h Wed Jul 13 01:28:24 2011 +0200
@@ -46,7 +46,6 @@
#define PREF_GROUP_NOTES @"Notes" //Preference group to store notes in
#define PREF_GROUP_ADDRESSBOOK @"Address Book"
#define PREF_GROUP_ALWAYS_VISIBLE @"Always Visible"
-#define PREF_GROUP_STAY_IN_CHAT @"Stay in chat"
#define KEY_EXPANDED @"IsExpanded"
diff -r 14685b7a7900 -r 28dbbe73b40b Frameworks/Adium Framework/Source/AIListBookmark.m
--- a/Frameworks/Adium Framework/Source/AIListBookmark.m Sat Jul 02 23:05:52 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.m Wed Jul 13 01:28:24 2011 +0200
@@ -383,12 +383,7 @@
[self notifyOfChangedPropertiesSilently:YES];
if (self.account.online && [[self preferenceForKey:KEY_AUTO_JOIN group:GROUP_LIST_BOOKMARK] boolValue]) {
- AIChat* chat = [self openChatWithoutActivating];
-
- if ([self stayInChat]) {
- // close chat will only close it from the interfacePlugin, i.e. remove the message tab
- [adium.interfaceController closeChat:chat];
- }
+ [self openChatWithoutActivating];
}
}
}
diff -r 14685b7a7900 -r 28dbbe73b40b Frameworks/Adium Framework/Source/AIListObject.h
--- a/Frameworks/Adium Framework/Source/AIListObject.h Sat Jul 02 23:05:52 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIListObject.h Wed Jul 13 01:28:24 2011 +0200
@@ -126,7 +126,6 @@
//Visibility
@property (readwrite, nonatomic) BOOL alwaysVisible;
- at property (readwrite, nonatomic) BOOL stayInChat;
//Grouping
//Not recommended for most uses. Use -groups and -metaContact instead unless you really need both
diff -r 14685b7a7900 -r 28dbbe73b40b Frameworks/Adium Framework/Source/AIListObject.m
--- a/Frameworks/Adium Framework/Source/AIListObject.m Sat Jul 02 23:05:52 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIListObject.m Wed Jul 13 01:28:24 2011 +0200
@@ -32,7 +32,6 @@
#define Group @"Group"
#define DisplayServiceID @"DisplayServiceID"
#define AlwaysVisible @"alwaysVisible"
-#define StayInChat @"StayInChat"
@interface AIListObject ()
- (void)setContainingGroup:(AIListGroup *)inGroup;
@@ -166,27 +165,6 @@
return [self boolValueForProperty:AlwaysVisible];
}
-/*!
- * @brief Sets if the chat will stay open in the background when it's closed
- */
-- (void)setStayInChat:(BOOL)stay
-{
- [self setPreference:[NSNumber numberWithBool:stay]
- forKey:StayInChat
- group:PREF_GROUP_STAY_IN_CHAT];
-}
-
-/*!
- * @brief Should we keep the chat around when the tab is closed?
- *
- * @returns If chat should stick around
- */
-- (BOOL)stayInChat
-{
- return [[self preferenceForKey:StayInChat group:PREF_GROUP_STAY_IN_CHAT] boolValue];
-}
-
-
//Grouping / Ownership -------------------------------------------------------------------------------------------------
#pragma mark Grouping / Ownership
diff -r 14685b7a7900 -r 28dbbe73b40b Resources/en.lproj/AIAdvancedInspectorPane.nib/designable.nib
--- a/Resources/en.lproj/AIAdvancedInspectorPane.nib/designable.nib Sat Jul 02 23:05:52 2011 -0500
+++ b/Resources/en.lproj/AIAdvancedInspectorPane.nib/designable.nib Wed Jul 13 01:28:24 2011 +0200
@@ -2,17 +2,33 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1305</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">823</string>
+ <string key="NS.object.0">1305</string>
</object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="6"/>
+ <string>NSSegmentedControl</string>
+ <string>NSPopUpButton</string>
+ <string>NSScroller</string>
+ <string>NSMenuItem</string>
+ <string>NSMenu</string>
+ <string>NSScrollView</string>
+ <string>NSButtonCell</string>
+ <string>NSButton</string>
+ <string>NSTextFieldCell</string>
+ <string>NSBox</string>
+ <string>NSTableView</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSTableColumn</string>
+ <string>NSTextField</string>
+ <string>NSSegmentedCell</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -41,9 +57,10 @@
<object class="NSBox" id="420328689">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{14.5, 196}, {273, 5}}</string>
- <string key="NSBounds">{{2.5, 0}, {269, 5}}</string>
+ <string key="NSFrame">{{14, 203}, {273, 5}}</string>
+ <string key="NSBounds">{{3, 0}, {268, 5}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -77,8 +94,9 @@
<object class="NSSegmentedControl" id="593552036">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{15, 12}, {58, 23}}</string>
+ <string key="NSFrame">{{15, 19}, {58, 23}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="548496227">
<int key="NSCellFlags">67239424</int>
@@ -115,8 +133,9 @@
<object class="NSButton" id="367197055">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{81, 249}, {208, 18}}</string>
+ <string key="NSFrame">{{81, 233}, {208, 18}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="338161928"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="857674845">
@@ -147,8 +166,9 @@
<object class="NSPopUpButton" id="526648846">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{81.5, 270}, {209, 22}}</string>
+ <string key="NSFrame">{{81, 254}, {209, 22}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="157655746"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="256599050">
@@ -206,8 +226,9 @@
<object class="NSTextField" id="618853396">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 276}, {64, 14}}</string>
+ <string key="NSFrame">{{12, 260}, {64, 14}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="526648846"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="73466680">
@@ -239,8 +260,9 @@
<object class="NSTextField" id="157655746">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-20, 253}, {95, 14}}</string>
+ <string key="NSFrame">{{-20, 237}, {95, 14}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="367197055"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="240162887">
@@ -253,34 +275,13 @@
<reference key="NSTextColor" ref="515509435"/>
</object>
</object>
- <object class="NSButton" id="927339848">
- <reference key="NSNextResponder" ref="415486846"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{81, 207}, {208, 18}}</string>
- <reference key="NSSuperview" ref="415486846"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="63806988">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">131072</int>
- <string key="NSContents">Hide chat instead of closing it</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="927339848"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="716016427"/>
- <reference key="NSAlternateImage" ref="373727624"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSButton" id="1031926986">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{81, 228}, {208, 18}}</string>
+ <string key="NSFrame">{{81, 212}, {208, 18}}</string>
<reference key="NSSuperview" ref="415486846"/>
- <reference key="NSNextKeyView" ref="927339848"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="177219583">
<int key="NSCellFlags">-2080244224</int>
@@ -301,8 +302,9 @@
<object class="NSTextField" id="338161928">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-20, 231}, {95, 14}}</string>
+ <string key="NSFrame">{{-20, 215}, {95, 14}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1031926986"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="613889512">
@@ -318,8 +320,9 @@
<object class="NSTextField" id="700146873">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-20, 173}, {95, 14}}</string>
+ <string key="NSFrame">{{-20, 180}, {95, 14}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="11541257"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="297588302">
@@ -335,8 +338,9 @@
<object class="NSPopUpButton" id="11541257">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{81.5, 167}, {209, 22}}</string>
+ <string key="NSFrame">{{81, 174}, {209, 22}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="881779345"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="443990279">
@@ -368,8 +372,9 @@
<object class="NSTextField" id="881779345">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{-21, 148}, {95, 14}}</string>
+ <string key="NSFrame">{{-21, 155}, {95, 14}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="10433997"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="255771465">
@@ -385,8 +390,9 @@
<object class="NSPopUpButton" id="10433997">
<reference key="NSNextResponder" ref="415486846"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{81.5, 142}, {209, 22}}</string>
+ <string key="NSFrame">{{81, 149}, {209, 22}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="234205489"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="188757842">
@@ -430,6 +436,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{271, 86}</string>
<reference key="NSSuperview" ref="411599534"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="264919868"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -495,6 +502,7 @@
</object>
<string key="NSFrame">{{1, 1}, {271, 86}}</string>
<reference key="NSSuperview" ref="234205489"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="685758981"/>
<reference key="NSDocView" ref="685758981"/>
<object class="NSColor" key="NSBGColor">
@@ -510,6 +518,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 1}, {15, 100}}</string>
<reference key="NSSuperview" ref="234205489"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="593552036"/>
<reference key="NSTarget" ref="234205489"/>
<string key="NSAction">_doScroller:</string>
@@ -520,6 +529,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {120, 15}}</string>
<reference key="NSSuperview" ref="234205489"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="411599534"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="234205489"/>
@@ -527,8 +537,9 @@
<double key="NSPercent">0.99047619104385376</double>
</object>
</object>
- <string key="NSFrame">{{14.5, 46}, {273, 88}}</string>
+ <string key="NSFrame">{{14, 53}, {273, 88}}</string>
<reference key="NSSuperview" ref="415486846"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="411599534"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="1052243442"/>
@@ -537,8 +548,9 @@
<bytes key="NSScrollAmts">QSAAAEEgAABBqAAAQagAAA</bytes>
</object>
</object>
- <string key="NSFrameSize">{300, 305}</string>
+ <string key="NSFrameSize">{300, 289}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="618853396"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
@@ -719,22 +731,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">checkBox_stayInChat</string>
- <reference key="source" ref="316663545"/>
- <reference key="destination" ref="927339848"/>
- </object>
- <int key="connectionID">332</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">setStayInChat:</string>
- <reference key="source" ref="316663545"/>
- <reference key="destination" ref="927339848"/>
- </object>
- <int key="connectionID">333</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">button_addRemoveGroup</string>
<reference key="source" ref="316663545"/>
<reference key="destination" ref="593552036"/>
@@ -802,7 +798,6 @@
<reference ref="1031926986"/>
<reference ref="881779345"/>
<reference ref="10433997"/>
- <reference ref="927339848"/>
<reference ref="338161928"/>
<reference ref="593552036"/>
<reference ref="420328689"/>
@@ -1031,20 +1026,6 @@
<reference key="parent" ref="188757842"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">328</int>
- <reference key="object" ref="927339848"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="63806988"/>
- </object>
- <reference key="parent" ref="415486846"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">329</int>
- <reference key="object" ref="63806988"/>
- <reference key="parent" ref="927339848"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">335</int>
<reference key="object" ref="593552036"/>
<object class="NSMutableArray" key="children">
@@ -1134,11 +1115,6 @@
<string>325.ImportedFromIB2</string>
<string>326.IBPluginDependency</string>
<string>326.ImportedFromIB2</string>
- <string>328.CustomClassName</string>
- <string>328.IBPluginDependency</string>
- <string>328.ImportedFromIB2</string>
- <string>329.IBPluginDependency</string>
- <string>329.ImportedFromIB2</string>
<string>335.CustomClassName</string>
<string>335.IBPluginDependency</string>
<string>335.IBViewBoundsToFrameTransform</string>
@@ -1228,11 +1204,6 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>AILocalizationButton</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>AISegmentedControl</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
@@ -1259,17 +1230,13 @@
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">341</int>
@@ -1437,7 +1404,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./classes-xjh84/AIAdvancedInspectorPane.h</string>
+ <string key="minorKey">./Classes/AIAdvancedInspectorPane.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1491,7 +1458,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./classes-xjh84/AILocalizationButton.h</string>
+ <string key="minorKey">./Classes/AILocalizationButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1545,7 +1512,7 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./classes-xjh84/AILocalizationTextField.h</string>
+ <string key="minorKey">./Classes/AILocalizationTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1553,7 +1520,7 @@
<string key="superclassName">NSSegmentedControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./classes-xjh84/AISegmentedControl.h</string>
+ <string key="minorKey">./Classes/AISegmentedControl.h</string>
</object>
</object>
</object>
@@ -1569,7 +1536,6 @@
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <string key="IBDocument.LastKnownRelativeProjectPath">../../Adium.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
diff -r 14685b7a7900 -r 28dbbe73b40b Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib
Binary file Resources/en.lproj/AIAdvancedInspectorPane.nib/keyedobjects.nib has changed
diff -r 14685b7a7900 -r 28dbbe73b40b Source/AIAdvancedInspectorPane.h
--- a/Source/AIAdvancedInspectorPane.h Sat Jul 02 23:05:52 2011 -0500
+++ b/Source/AIAdvancedInspectorPane.h Wed Jul 13 01:28:24 2011 +0200
@@ -39,7 +39,6 @@
IBOutlet NSButton *checkBox_alwaysShow;
IBOutlet NSButton *checkBox_autoJoin;
- IBOutlet NSButton *checkBox_stayInChat;
BOOL switchingContacts;
@@ -59,7 +58,6 @@
- (IBAction)selectedEncryptionPreference:(id)sender;
- (IBAction)setVisible:(id)sender;
- (IBAction)setAutoJoin:(id)sender;
-- (IBAction)setStayInChat:(id)sender;
- (IBAction)addOrRemoveGroup:(id)sender;
@end
diff -r 14685b7a7900 -r 28dbbe73b40b Source/AIAdvancedInspectorPane.m
--- a/Source/AIAdvancedInspectorPane.m Sat Jul 02 23:05:52 2011 -0500
+++ b/Source/AIAdvancedInspectorPane.m Wed Jul 13 01:28:24 2011 +0200
@@ -132,9 +132,6 @@
[checkBox_autoJoin setEnabled:[inObject isKindOfClass:[AIListBookmark class]]];
[checkBox_autoJoin setState:[[inObject preferenceForKey:KEY_AUTO_JOIN group:GROUP_LIST_BOOKMARK] boolValue]];
-
- [checkBox_stayInChat setEnabled:[inObject isKindOfClass:[AIListBookmark class]]];
- [checkBox_stayInChat setState:inObject.stayInChat];
[popUp_accounts setEnabled:![inObject isKindOfClass:[AIListGroup class]]];
[popUp_contact setEnabled:![inObject isKindOfClass:[AIListGroup class]]];
@@ -162,11 +159,6 @@
group:GROUP_LIST_BOOKMARK];
}
-- (IBAction)setStayInChat:(id)sender
-{
- [displayedObject setStayInChat:[checkBox_stayInChat state]];
-}
-
#pragma mark Menus
-(void)reloadPopup
{
diff -r 14685b7a7900 -r 28dbbe73b40b Source/AIChatController.m
--- a/Source/AIChatController.m Sat Jul 02 23:05:52 2011 -0500
+++ b/Source/AIChatController.m Wed Jul 13 01:28:24 2011 +0200
@@ -530,7 +530,7 @@
*/
- (BOOL)closeChat:(AIChat *)inChat
{
- BOOL shouldRemove, stayInChat;
+ BOOL shouldRemove;
/* If we are currently passing a content object for this chat through our content filters, don't remove it from
* our openChats set as it will become needed soon. If we were to remove it, and a second message came in which was
@@ -538,22 +538,7 @@
* chat, generating a duplicate.
*/
shouldRemove = ![adium.contentController chatIsReceivingContent:inChat];
-
- {
- AIListObject* listObject;
-
- if (inChat.isGroupChat)
- listObject = [adium.contactController existingBookmarkForChat:inChat];
- else
- listObject = inChat.listObject;
-
- // If we want to stay in the chat keep the AIChat open
- stayInChat = (listObject != NULL && [listObject stayInChat]);
-
- // If we are quitting don't stay in chat
- stayInChat &= !adium.isQuitting;
- }
-
+
[inChat retain];
if (mostRecentChat == inChat) {
@@ -565,7 +550,7 @@
[[NSNotificationCenter defaultCenter] postNotificationName:Chat_WillClose object:inChat userInfo:nil];
//Remove the chat
- if (shouldRemove && !stayInChat) {
+ if (shouldRemove) {
/* If we didn't remove the chat because we're waiting for it to reopen, don't cause the account
* to close down the chat.
*/
diff -r 14685b7a7900 -r 28dbbe73b40b Source/AIContentController.m
--- a/Source/AIContentController.m Sat Jul 02 23:05:52 2011 -0500
+++ b/Source/AIContentController.m Wed Jul 13 01:28:24 2011 +0200
@@ -506,14 +506,9 @@
(![inObject isOutgoing]));
shouldPostContentReceivedEvents = contentReceived && [inObject trackContent];
- AIListObject *listObject = chat.listObject;
- if(chat.isGroupChat)
- listObject = (AIListObject *)[adium.contactController existingBookmarkForChat:chat];
-
- if (![chat isOpen] && (!chat.isGroupChat || !listObject.stayInChat)) {
+ if (![chat isOpen]) {
/* Tell the interface to open the chat
* For incoming messages, we don't open the chat until we're sure that new content is being received.
- * For group chats, we only open the chat for an unviewed mention. This is done in AIMentionEventPlugin.m.
*/
[adium.interfaceController openChat:chat];
}
@@ -527,8 +522,11 @@
if (shouldPostContentReceivedEvents) {
NSSet *previouslyPerformedActionIDs = nil;
+ AIListObject *listObject = chat.listObject;
if(chat.isGroupChat) {
+ listObject = (AIListObject *)[adium.contactController existingBookmarkForChat:chat];
+
if ([inObject.displayClasses containsObject:@"mention"]) {
previouslyPerformedActionIDs = [adium.contactAlertsController generateEvent:CONTENT_GROUP_CHAT_MENTION
forListObject:listObject
diff -r 14685b7a7900 -r 28dbbe73b40b Source/AIMentionEventPlugin.m
--- a/Source/AIMentionEventPlugin.m Sat Jul 02 23:05:52 2011 -0500
+++ b/Source/AIMentionEventPlugin.m Wed Jul 13 01:28:24 2011 +0200
@@ -89,13 +89,6 @@
if([predicate evaluateWithObject:messageString]) {
if(message.trackContent && adium.interfaceController.activeChat != chat) {
[chat incrementUnviewedMentionCount];
-
- if (![chat isOpen]) {
- /* See related code at AIContentController.m in finishDisplayContentObject.
- * We only want to open group chats if someone mentions us.
- */
- [adium.interfaceController openChat:chat];
- }
}
[message addDisplayClass:@"mention"];
break;
More information about the commits
mailing list