adium 4158:13d1f4765a89: Added MAZeroingWeakRef
commits at adium.im
commits at adium.im
Sun Aug 21 21:37:46 UTC 2011
details: http://hg.adium.im/adium/rev/13d1f4765a89
revision: 4158:13d1f4765a89
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:17:51 2011 -0500
Added MAZeroingWeakRef
Subject: adium 4159:02723e78ce6a: Silenced some more nib warnings in xcode 4.2
details: http://hg.adium.im/adium/rev/02723e78ce6a
revision: 4159:02723e78ce6a
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:18:55 2011 -0500
Silenced some more nib warnings in xcode 4.2
Subject: adium 4160:a140a4b77ec6: warnings--;
details: http://hg.adium.im/adium/rev/a140a4b77ec6
revision: 4160:a140a4b77ec6
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:19:20 2011 -0500
warnings--;
Subject: adium 4161:8de0a4e32e42: AIProxyListObject no longer retains the ESObjectWithProperties which retains it; instead, it maintains a zeroing weak reference. This simplifies the memory management significantly.
details: http://hg.adium.im/adium/rev/8de0a4e32e42
revision: 4161:8de0a4e32e42
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:34:04 2011 -0500
AIProxyListObject no longer retains the ESObjectWithProperties which retains it; instead, it maintains a zeroing weak reference. This simplifies the memory management significantly.
* Don't try to aggressively release AIProxyListObjects when a group is collapsed. Instead, clear out its display cache. At that point, it's a very small object, and it can live until the AIListObject is deallocated.
* Although messaging the AIProxyListObject results in a call through to -[AIPorxyListObject listObject], it's clearer to use this directly. (Future changes should probably remove its 'mirroring' capability entirely; it's just a set up for confusion and mis-casting).
* I believe that between this and kbotc's changes, this fixes #14294. I never could reproduce the crash in the first place, though. Please test and report back.
Subject: adium 4162:bbd488f2f3d4: Project updates to add MAZeroingWeakRef and friends
details: http://hg.adium.im/adium/rev/bbd488f2f3d4
revision: 4162:bbd488f2f3d4
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:34:37 2011 -0500
Project updates to add MAZeroingWeakRef and friends
Subject: adium 4163:5d84f38e68bb: Added MAZeroingWeakRef to the credits
details: http://hg.adium.im/adium/rev/5d84f38e68bb
revision: 4163:5d84f38e68bb
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:36:20 2011 -0500
Added MAZeroingWeakRef to the credits
Subject: adium 4164:4a87584e9e3a: Added MAZeroingWeakRef's license information to our license.txt
details: http://hg.adium.im/adium/rev/4a87584e9e3a
revision: 4164:4a87584e9e3a
branch: (none)
author: Evan Schoenberg
date: Sun Aug 21 16:37:35 2011 -0500
Added MAZeroingWeakRef's license information to our license.txt
diffs (truncated from 13352 to 1000 lines):
diff -r 80d30fd0e0d8 -r 4a87584e9e3a Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Aug 21 16:15:48 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj Sun Aug 21 16:37:35 2011 -0500
@@ -388,6 +388,14 @@
346636AC0D415440006C9034 /* FriBidi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3466368B0D41541A006C9034 /* FriBidi.framework */; };
346637690D415457006C9034 /* FriBidi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 3466368B0D41541A006C9034 /* FriBidi.framework */; };
346935D60BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */; };
+ 346B5AD114016ABF00A29B7F /* MANotificationCenterAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C4D09113EF436E0054DB25 /* MANotificationCenterAdditions.h */; };
+ 346B5AD214016ABF00A29B7F /* MANotificationCenterAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C4D09213EF436E0054DB25 /* MANotificationCenterAdditions.m */; };
+ 346B5AD314016ABF00A29B7F /* MAWeakArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C4D09313EF436E0054DB25 /* MAWeakArray.h */; };
+ 346B5AD414016ABF00A29B7F /* MAWeakArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C4D09413EF436E0054DB25 /* MAWeakArray.m */; };
+ 346B5AD514016ABF00A29B7F /* MAWeakDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C4D09513EF436E0054DB25 /* MAWeakDictionary.h */; };
+ 346B5AD614016ABF00A29B7F /* MAWeakDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C4D09613EF436E0054DB25 /* MAWeakDictionary.m */; };
+ 346B5AD714016ABF00A29B7F /* MAZeroingWeakProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C4D09713EF436E0054DB25 /* MAZeroingWeakProxy.h */; };
+ 346B5AD814016ABF00A29B7F /* MAZeroingWeakProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C4D09813EF436E0054DB25 /* MAZeroingWeakProxy.m */; };
346BA33F0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */; };
346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; };
346BA3640774C35500628F06 /* GlobalEventsPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.nib */; };
@@ -575,6 +583,7 @@
34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */; };
348B250D0A50A1C900B2B972 /* ESSourceListBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348B250B0A50A1C900B2B972 /* ESSourceListBackgroundView.m */; };
348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */; };
+ 348F30E113EFF81700865B0B /* StatusMessage.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C913EDC2E50032EF52 /* StatusMessage.applescript */; };
348F57940936F3CC00288E41 /* ESEditStatusGroupWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 348F57920936F3CC00288E41 /* ESEditStatusGroupWindowController.m */; };
348F579E0936FA6D00288E41 /* EditStatusGroup.nib in Resources */ = {isa = PBXBuildFile; fileRef = 348F579D0936FA6D00288E41 /* EditStatusGroup.nib */; };
349062A2127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 349062A1127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m */; };
@@ -659,6 +668,11 @@
34C14CD307A8B1AB003CC138 /* AIEmoticonPackPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C14CD107A8B1AB003CC138 /* AIEmoticonPackPreviewView.m */; };
34C14D5107A8BA00003CC138 /* EmoticonPackPreview.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34C14D5007A8BA00003CC138 /* EmoticonPackPreview.nib */; };
34C18B0D06CAC95400FF5FF9 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E839050583207E00F2AADB /* SystemConfiguration.framework */; };
+ 34C4D0A313EF436E0054DB25 /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 34C4D08D13EF436E0054DB25 /* LICENSE */; };
+ 34C4D0A413EF436E0054DB25 /* README.markdown in Resources */ = {isa = PBXBuildFile; fileRef = 34C4D08E13EF436E0054DB25 /* README.markdown */; };
+ 34C4D0B013EF436E0054DB25 /* ZeroingWeakRef_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 34C4D09E13EF436E0054DB25 /* ZeroingWeakRef_Prefix.pch */; };
+ 34C4D0BC13EF48270054DB25 /* MAZeroingWeakRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C4D09913EF436E0054DB25 /* MAZeroingWeakRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 34C4D0BD13EF48270054DB25 /* MAZeroingWeakRef.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C4D09A13EF436E0054DB25 /* MAZeroingWeakRef.m */; };
34C68B260778FA1300EB423C /* ESGeneralPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B240778FA1300EB423C /* ESGeneralPreferencesPlugin.m */; };
34C68B2C0778FA5C00EB423C /* ESGeneralPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C68B2A0778FA5C00EB423C /* ESGeneralPreferences.m */; };
34C6A3BC077A8CB500EB423C /* AppearanceDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C6A3BB077A8CB500EB423C /* AppearanceDefaults.plist */; };
@@ -1129,16 +1143,9 @@
5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
5A23E0B513EDB9950032EF52 /* CurrentTunes.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B413EDB9950032EF52 /* CurrentTunes.applescript */; };
- 5A23E0BC13EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B613EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript */; };
- 5A23E0BD13EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B713EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript */; };
- 5A23E0BE13EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B813EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript */; };
- 5A23E0BF13EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B913EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript */; };
- 5A23E0C013EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0BA13EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript */; };
- 5A23E0C113EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0BB13EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript */; };
5A23E0CB13EDC2E50032EF52 /* ActiveApplication.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C613EDC2E50032EF52 /* ActiveApplication.applescript */; };
5A23E0CC13EDC2E50032EF52 /* AdiumBuild.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C713EDC2E50032EF52 /* AdiumBuild.applescript */; };
5A23E0CD13EDC2E50032EF52 /* AdiumVersion.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C813EDC2E50032EF52 /* AdiumVersion.applescript */; };
- 5A23E0CE13EDC2E50032EF52 /* StatusMessage.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C913EDC2E50032EF52 /* StatusMessage.applescript */; };
5A23E0CF13EDC2E50032EF52 /* Uptime.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0CA13EDC2E50032EF52 /* Uptime.applescript */; };
5A5F601D12962EC0007A2232 /* AISegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F601A12962D06007A2232 /* AISegmentedControl.m */; };
5A5F601E12962ECE007A2232 /* AISegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A5F601912962D06007A2232 /* AISegmentedControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -3549,6 +3556,19 @@
34C2E6880634CF940018E5D2 /* ESPurpleNovellAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPurpleNovellAccountViewController.m; path = "Plugins/Purple Service/ESPurpleNovellAccountViewController.m"; sourceTree = "<group>"; };
34C2EA180634DB5E0018E5D2 /* ESNovellService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESNovellService.h; path = "Plugins/Purple Service/ESNovellService.h"; sourceTree = "<group>"; };
34C2EA190634DB5E0018E5D2 /* ESNovellService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESNovellService.m; path = "Plugins/Purple Service/ESNovellService.m"; sourceTree = "<group>"; };
+ 34C4D08D13EF436E0054DB25 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
+ 34C4D08E13EF436E0054DB25 /* README.markdown */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.markdown; sourceTree = "<group>"; };
+ 34C4D09113EF436E0054DB25 /* MANotificationCenterAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MANotificationCenterAdditions.h; sourceTree = "<group>"; };
+ 34C4D09213EF436E0054DB25 /* MANotificationCenterAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MANotificationCenterAdditions.m; sourceTree = "<group>"; };
+ 34C4D09313EF436E0054DB25 /* MAWeakArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAWeakArray.h; sourceTree = "<group>"; };
+ 34C4D09413EF436E0054DB25 /* MAWeakArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAWeakArray.m; sourceTree = "<group>"; };
+ 34C4D09513EF436E0054DB25 /* MAWeakDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAWeakDictionary.h; sourceTree = "<group>"; };
+ 34C4D09613EF436E0054DB25 /* MAWeakDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAWeakDictionary.m; sourceTree = "<group>"; };
+ 34C4D09713EF436E0054DB25 /* MAZeroingWeakProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAZeroingWeakProxy.h; sourceTree = "<group>"; };
+ 34C4D09813EF436E0054DB25 /* MAZeroingWeakProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAZeroingWeakProxy.m; sourceTree = "<group>"; };
+ 34C4D09913EF436E0054DB25 /* MAZeroingWeakRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MAZeroingWeakRef.h; sourceTree = "<group>"; };
+ 34C4D09A13EF436E0054DB25 /* MAZeroingWeakRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MAZeroingWeakRef.m; sourceTree = "<group>"; };
+ 34C4D09E13EF436E0054DB25 /* ZeroingWeakRef_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroingWeakRef_Prefix.pch; sourceTree = "<group>"; };
34C4E3A20DF9D73600499AC0 /* it */ = {isa = PBXFileReference; lastKnownFileType = folder; name = it; path = "Resources/it.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
34C68B230778FA1300EB423C /* ESGeneralPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESGeneralPreferencesPlugin.h; path = "Plugins/General Preferences/ESGeneralPreferencesPlugin.h"; sourceTree = "<group>"; };
34C68B240778FA1300EB423C /* ESGeneralPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESGeneralPreferencesPlugin.m; path = "Plugins/General Preferences/ESGeneralPreferencesPlugin.m"; sourceTree = "<group>"; };
@@ -6287,6 +6307,35 @@
name = "Novell GroupWise";
sourceTree = "<group>";
};
+ 34C4D08C13EF436E0054DB25 /* MAZeroingWeakRef */ = {
+ isa = PBXGroup;
+ children = (
+ 34C4D08D13EF436E0054DB25 /* LICENSE */,
+ 34C4D08E13EF436E0054DB25 /* README.markdown */,
+ 34C4D08F13EF436E0054DB25 /* Source */,
+ 34C4D09E13EF436E0054DB25 /* ZeroingWeakRef_Prefix.pch */,
+ );
+ name = MAZeroingWeakRef;
+ path = Frameworks/MAZeroingWeakRef;
+ sourceTree = "<group>";
+ };
+ 34C4D08F13EF436E0054DB25 /* Source */ = {
+ isa = PBXGroup;
+ children = (
+ 34C4D09113EF436E0054DB25 /* MANotificationCenterAdditions.h */,
+ 34C4D09213EF436E0054DB25 /* MANotificationCenterAdditions.m */,
+ 34C4D09313EF436E0054DB25 /* MAWeakArray.h */,
+ 34C4D09413EF436E0054DB25 /* MAWeakArray.m */,
+ 34C4D09513EF436E0054DB25 /* MAWeakDictionary.h */,
+ 34C4D09613EF436E0054DB25 /* MAWeakDictionary.m */,
+ 34C4D09713EF436E0054DB25 /* MAZeroingWeakProxy.h */,
+ 34C4D09813EF436E0054DB25 /* MAZeroingWeakProxy.m */,
+ 34C4D09913EF436E0054DB25 /* MAZeroingWeakRef.h */,
+ 34C4D09A13EF436E0054DB25 /* MAZeroingWeakRef.m */,
+ );
+ path = Source;
+ sourceTree = "<group>";
+ };
34C68B1C0778F9C200EB423C /* General Preferences */ = {
isa = PBXGroup;
children = (
@@ -6383,6 +6432,7 @@
34D8342B07CBE6A4006466F2 /* External Sources */ = {
isa = PBXGroup;
children = (
+ 34C4D08C13EF436E0054DB25 /* MAZeroingWeakRef */,
34D834CD07CBE7A3006466F2 /* Text field for previewing font preferences */,
348B25C70A50FBF300B2B972 /* KNShelfSplitView.h */,
348B25C60A50FBF300B2B972 /* KNShelfSplitView.m */,
@@ -8675,8 +8725,8 @@
4B82138F049CA6CC00A8010A /* AIChat.m */,
4BF5BA14042F3CB200A8010A /* AIListObject.h */,
4BF5BA15042F3CB200A8010A /* AIListObject.m */,
+ 63B0EC9B0F8FBB660062476B /* AIProxyListObject.h */,
63B0EC9A0F8FBB660062476B /* AIProxyListObject.m */,
- 63B0EC9B0F8FBB660062476B /* AIProxyListObject.h */,
4BF5BA12042F3CB200A8010A /* AIListGroup.h */,
4BF5BA13042F3CB200A8010A /* AIListGroup.m */,
63DF5B210E52D77F00010E99 /* AIContactList.h */,
@@ -9059,6 +9109,7 @@
34D8154613B663700022C8C4 /* JSONKit.h in Headers */,
34D8154E13B663A80022C8C4 /* auth_fb.h in Headers */,
34D8155013B663A80022C8C4 /* fbapi.h in Headers */,
+ 34C4D0B013EF436E0054DB25 /* ZeroingWeakRef_Prefix.pch in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9191,6 +9242,11 @@
34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
118199C610D0B65A003E8ECA /* AIMedia.h in Headers */,
+ 34C4D0BC13EF48270054DB25 /* MAZeroingWeakRef.h in Headers */,
+ 346B5AD114016ABF00A29B7F /* MANotificationCenterAdditions.h in Headers */,
+ 346B5AD314016ABF00A29B7F /* MAWeakArray.h in Headers */,
+ 346B5AD514016ABF00A29B7F /* MAWeakDictionary.h in Headers */,
+ 346B5AD714016ABF00A29B7F /* MAZeroingWeakProxy.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9639,6 +9695,8 @@
34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */,
34C8D06C13B688670073718A /* f_logo_small.png in Resources */,
34C8D06D13B688670073718A /* f_logo.png in Resources */,
+ 34C4D0A313EF436E0054DB25 /* LICENSE in Resources */,
+ 34C4D0A413EF436E0054DB25 /* README.markdown in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10575,8 +10633,8 @@
5A23E0CB13EDC2E50032EF52 /* ActiveApplication.applescript in Sources */,
5A23E0CC13EDC2E50032EF52 /* AdiumBuild.applescript in Sources */,
5A23E0CD13EDC2E50032EF52 /* AdiumVersion.applescript in Sources */,
- 5A23E0CE13EDC2E50032EF52 /* StatusMessage.applescript in Sources */,
5A23E0CF13EDC2E50032EF52 /* Uptime.applescript in Sources */,
+ 348F30E113EFF81700865B0B /* StatusMessage.applescript in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10687,12 +10745,11 @@
34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */,
63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
118199C710D0B65A003E8ECA /* AIMedia.m in Sources */,
- 5A23E0BC13EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript in Sources */,
- 5A23E0BD13EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript in Sources */,
- 5A23E0BE13EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript in Sources */,
- 5A23E0BF13EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript in Sources */,
- 5A23E0C013EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript in Sources */,
- 5A23E0C113EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript in Sources */,
+ 34C4D0BD13EF48270054DB25 /* MAZeroingWeakRef.m in Sources */,
+ 346B5AD214016ABF00A29B7F /* MANotificationCenterAdditions.m in Sources */,
+ 346B5AD414016ABF00A29B7F /* MAWeakArray.m in Sources */,
+ 346B5AD614016ABF00A29B7F /* MAWeakDictionary.m in Sources */,
+ 346B5AD814016ABF00A29B7F /* MAZeroingWeakProxy.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 80d30fd0e0d8 -r 4a87584e9e3a Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/designable.nib Sun Aug 21 16:15:48 2011 -0500
+++ b/Frameworks/Adium Framework/Resources/da.lproj/EditStateSheet.nib/designable.nib Sun Aug 21 16:37:35 2011 -0500
@@ -2,24 +2,44 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10J869</string>
- <string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.SystemVersion">11B26</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1617</string>
+ <string key="IBDocument.AppKitVersion">1138</string>
+ <string key="IBDocument.HIToolboxVersion">566.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">851</string>
+ <string key="NS.object.0">1617</string>
</object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSTextField</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSScroller</string>
+ <string>NSPopUpButton</string>
+ <string>NSButton</string>
+ <string>NSMenu</string>
+ <string>NSScrollView</string>
+ <string>NSButtonCell</string>
+ <string>NSTextFieldCell</string>
+ <string>NSBox</string>
+ <string>NSMenuItem</string>
+ <string>NSCustomObject</string>
+ <string>NSTextView</string>
+ <string>NSView</string>
+ <string>NSWindowTemplate</string>
+ <string>NSStepper</string>
+ <string>NSStepperCell</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="358641459">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -42,10 +62,11 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{403, 477}</string>
+ <nil key="NSUserInterfaceItemIdentifier"/>
+ <string key="NSWindowContentMaxSize">{403, 517}</string>
<string key="NSWindowContentMinSize">{403, 477}</string>
<object class="NSView" key="NSWindowView" id="814972862">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -54,6 +75,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{305, 8}, {84, 32}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="916531342">
<int key="NSCellFlags">67239424</int>
@@ -79,6 +101,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{211, 8}, {94, 32}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="27044480"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="707645780">
<int key="NSCellFlags">67239424</int>
@@ -100,6 +123,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{12, 128}, {294, 18}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="458384420"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="822963041">
<int key="NSCellFlags">67239424</int>
@@ -127,6 +151,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{12, 273}, {86, 18}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="44917562"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="639173016">
<int key="NSCellFlags">67239424</int>
@@ -149,6 +174,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{35, 251}, {235, 18}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="512886045"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="766555288">
<int key="NSCellFlags">67239424</int>
@@ -179,31 +205,9 @@
<object class="NSTextView" id="9285364">
<reference key="NSNextResponder" ref="234432051"/>
<int key="NSvFlags">2322</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="set.sortedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Apple HTML pasteboard type</string>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </object>
- </object>
<string key="NSFrameSize">{344, 14}</string>
<reference key="NSSuperview" ref="234432051"/>
+ <reference key="NSNextKeyView" ref="788201205"/>
<object class="NSTextContainer" key="NSTextContainer" id="9869414">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -224,7 +228,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">28647</int>
+ <int key="NSFlags">67137511</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<object class="NSColor" key="NSBackgroundColor" id="826244119">
@@ -283,9 +287,11 @@
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{690, 1e+07}</string>
+ <string key="NSMaxSize">{690, 10000000}</string>
<string key="NSMinize">{344, 0}</string>
<nil key="NSDelegate"/>
</object>
@@ -296,8 +302,30 @@
<reference key="NSDocView" ref="9285364"/>
<reference key="NSBGColor" ref="826244119"/>
<object class="NSCursor" key="NSCursor" id="864856263">
- <string key="NSHotSpot">{4, -5}</string>
- <int key="NSCursorType">1</int>
+ <string key="NSHotSpot">{4, 5}</string>
+ <object class="NSImage" key="NSImage">
+ <int key="NSImageFlags">12582912</int>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym
+SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA
+AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA
+AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA
+AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ </object>
</object>
<int key="NScvFlags">4</int>
</object>
@@ -306,6 +334,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
<reference key="NSSuperview" ref="512886045"/>
+ <reference key="NSNextKeyView" ref="234432051"/>
<reference key="NSTarget" ref="512886045"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@@ -315,6 +344,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="512886045"/>
+ <reference key="NSNextKeyView" ref="529415983"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="512886045"/>
<string key="NSAction">_doScroller:</string>
@@ -324,8 +354,8 @@
</object>
<string key="NSFrame">{{37, 152}, {346, 93}}</string>
<reference key="NSSuperview" ref="814972862"/>
- <reference key="NSNextKeyView" ref="234432051"/>
- <int key="NSsFlags">530</int>
+ <reference key="NSNextKeyView" ref="907260749"/>
+ <int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="529415983"/>
<reference key="NSHScroller" ref="907260749"/>
<reference key="NSContentView" ref="234432051"/>
@@ -337,7 +367,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="938002343">
<reference key="NSNextResponder" ref="458384420"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSStepper" id="122567027">
@@ -345,6 +375,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{129, -3}, {19, 28}}</string>
<reference key="NSSuperview" ref="938002343"/>
+ <reference key="NSNextKeyView" ref="43105144"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="7593346">
<int key="NSCellFlags">68025888</int>
@@ -367,6 +398,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{105, 0}, {25, 22}}</string>
<reference key="NSSuperview" ref="938002343"/>
+ <reference key="NSNextKeyView" ref="122567027"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="45198099">
<int key="NSCellFlags">-1804468671</int>
@@ -394,6 +426,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{150, 3}, {94, 17}}</string>
<reference key="NSSuperview" ref="938002343"/>
+ <reference key="NSNextKeyView" ref="761373936"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="552111031">
<int key="NSCellFlags">67239424</int>
@@ -420,6 +453,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{24, -3}, {19, 28}}</string>
<reference key="NSSuperview" ref="938002343"/>
+ <reference key="NSNextKeyView" ref="985952883"/>
<bool key="NSEnabled">YES</bool>
<object class="NSStepperCell" key="NSCell" id="314013020">
<int key="NSCellFlags">68025888</int>
@@ -437,6 +471,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{45, 3}, {42, 17}}</string>
<reference key="NSSuperview" ref="938002343"/>
+ <reference key="NSNextKeyView" ref="771490185"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="290169161">
<int key="NSCellFlags">67239424</int>
@@ -453,6 +488,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrameSize">{25, 22}</string>
<reference key="NSSuperview" ref="938002343"/>
+ <reference key="NSNextKeyView" ref="669758812"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="57143104">
<int key="NSCellFlags">-1804468671</int>
@@ -468,10 +504,12 @@
</object>
<string key="NSFrameSize">{330, 22}</string>
<reference key="NSSuperview" ref="458384420"/>
+ <reference key="NSNextKeyView" ref="561091667"/>
</object>
</object>
<string key="NSFrame">{{37, 100}, {330, 22}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="938002343"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -497,7 +535,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="463779973">
<reference key="NSNextResponder" ref="302320707"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSScrollView" id="289691074">
@@ -513,31 +551,9 @@
<object class="NSTextView" id="930044710">
<reference key="NSNextResponder" ref="368691639"/>
<int key="NSvFlags">2322</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="set.sortedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Apple HTML pasteboard type</string>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </object>
- </object>
<string key="NSFrameSize">{355, 14}</string>
<reference key="NSSuperview" ref="368691639"/>
+ <reference key="NSNextKeyView" ref="640354636"/>
<object class="NSTextContainer" key="NSTextContainer" id="178239353">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -558,7 +574,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">28647</int>
+ <int key="NSFlags">67137511</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="826244119"/>
@@ -592,9 +608,11 @@
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">1</int>
</object>
<int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{712, 1e+07}</string>
+ <string key="NSMaxSize">{712, 10000000}</string>
<string key="NSMinize">{355, 0}</string>
<nil key="NSDelegate"/>
</object>
@@ -612,6 +630,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-30, 1}, {15, 91}}</string>
<reference key="NSSuperview" ref="289691074"/>
+ <reference key="NSNextKeyView" ref="368691639"/>
<reference key="NSTarget" ref="289691074"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
@@ -621,6 +640,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="289691074"/>
+ <reference key="NSNextKeyView" ref="984827689"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="289691074"/>
<string key="NSAction">_doScroller:</string>
@@ -630,8 +650,8 @@
</object>
<string key="NSFrame">{{17, 2}, {357, 93}}</string>
<reference key="NSSuperview" ref="463779973"/>
- <reference key="NSNextKeyView" ref="368691639"/>
- <int key="NSsFlags">530</int>
+ <reference key="NSNextKeyView" ref="986489994"/>
+ <int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="984827689"/>
<reference key="NSHScroller" ref="986489994"/>
<reference key="NSContentView" ref="368691639"/>
@@ -641,6 +661,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{3, 103}, {322, 17}}</string>
<reference key="NSSuperview" ref="463779973"/>
+ <reference key="NSNextKeyView" ref="289691074"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="318179057">
<int key="NSCellFlags">67239424</int>
@@ -655,10 +676,12 @@
</object>
<string key="NSFrameSize">{390, 119}</string>
<reference key="NSSuperview" ref="302320707"/>
+ <reference key="NSNextKeyView" ref="288889109"/>
</object>
</object>
<string key="NSFrame">{{11, 305}, {390, 119}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="463779973"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -682,6 +705,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{14, 464}, {369, 5}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="244972062"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -704,6 +728,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{12, 17}, {169, 18}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="66371932"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="855471422">
<int key="NSCellFlags">67239424</int>
@@ -728,7 +753,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="122408033">
<reference key="NSNextResponder" ref="442162154"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="121970581">
@@ -736,6 +761,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{57, 3}, {325, 22}}</string>
<reference key="NSSuperview" ref="122408033"/>
+ <reference key="NSNextKeyView" ref="24210261"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="578242369">
<int key="NSCellFlags">-1804468671</int>
@@ -753,6 +779,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{15, 6}, {34, 16}}</string>
<reference key="NSSuperview" ref="122408033"/>
+ <reference key="NSNextKeyView" ref="121970581"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="325060099">
<int key="NSCellFlags">67239424</int>
@@ -767,10 +794,12 @@
</object>
<string key="NSFrameSize">{395, 30}</string>
<reference key="NSSuperview" ref="442162154"/>
+ <reference key="NSNextKeyView" ref="306420674"/>
</object>
</object>
<string key="NSFrame">{{-2, 476}, {395, 30}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="122408033"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -796,7 +825,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="578775896">
<reference key="NSNextResponder" ref="244972062"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSPopUpButton" id="4167036">
@@ -804,6 +833,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{75, 0}, {311, 26}}</string>
<reference key="NSSuperview" ref="578775896"/>
+ <reference key="NSNextKeyView" ref="302320707"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="267917995">
<int key="NSCellFlags">-2076049856</int>
@@ -882,6 +912,7 @@
<int key="NSvFlags">264</int>
<string key="NSFrame">{{15, 6}, {55, 16}}</string>
<reference key="NSSuperview" ref="578775896"/>
+ <reference key="NSNextKeyView" ref="4167036"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="606154235">
<int key="NSCellFlags">67239424</int>
@@ -896,10 +927,12 @@
</object>
<string key="NSFrameSize">{401, 27}</string>
<reference key="NSSuperview" ref="244972062"/>
+ <reference key="NSNextKeyView" ref="277469187"/>
</object>
</object>
<string key="NSFrame">{{-2, 429}, {401, 27}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="578775896"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -923,6 +956,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 68}, {92, 18}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="717832626"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="996533889">
<int key="NSCellFlags">67239424</int>
@@ -945,6 +979,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{12, 43}, {107, 18}}</string>
<reference key="NSSuperview" ref="814972862"/>
+ <reference key="NSNextKeyView" ref="737329984"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="430141449">
<int key="NSCellFlags">67239424</int>
@@ -964,10 +999,18 @@
</object>
</object>
<string key="NSFrameSize">{403, 517}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSNextKeyView" ref="442162154"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{403, 499}</string>
- <string key="NSMaxSize">{403, 499}</string>
+ <string key="NSMaxSize">{403, 539}</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
+ </object>
+ <object class="NSView" id="726426845">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{125, 1}</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -1411,9 +1454,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <object class="NSArray" key="object" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="object" ref="0"/>
<reference key="children" ref="358641459"/>
<nil key="parent"/>
</object>
@@ -1513,20 +1554,10 @@
<reference key="object" ref="24210261"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="726426845">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{2, 2}, {125, 1}}</string>
- </object>
</object>
<reference key="parent" ref="814972862"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
- <reference key="object" ref="726426845"/>
- <reference key="parent" ref="24210261"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">24</int>
<reference key="object" ref="302320707"/>
<object class="NSMutableArray" key="children">
@@ -1877,26 +1908,27 @@
<reference key="object" ref="606154235"/>
<reference key="parent" ref="277469187"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="726426845"/>
+ <reference key="parent" ref="0"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.IBPluginDependency</string>
+ <string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
- <string>-3.ImportedFromIB2</string>
<string>10.IBPluginDependency</string>
- <string>10.ImportedFromIB2</string>
<string>11.CustomClassName</string>
<string>11.IBPluginDependency</string>
- <string>11.ImportedFromIB2</string>
<string>12.IBPluginDependency</string>
- <string>12.ImportedFromIB2</string>
<string>122.IBPluginDependency</string>
- <string>122.ImportedFromIB2</string>
<string>13.CustomClassName</string>
<string>13.IBPluginDependency</string>
- <string>13.ImportedFromIB2</string>
<string>133.IBPluginDependency</string>
<string>134.IBPluginDependency</string>
<string>135.IBPluginDependency</string>
@@ -1905,7 +1937,6 @@
<string>138.IBPluginDependency</string>
<string>139.IBPluginDependency</string>
<string>14.IBPluginDependency</string>
- <string>14.ImportedFromIB2</string>
<string>140.IBPluginDependency</string>
<string>141.IBPluginDependency</string>
<string>142.IBPluginDependency</string>
@@ -1918,7 +1949,6 @@
<string>149.IBPluginDependency</string>
<string>15.CustomClassName</string>
<string>15.IBPluginDependency</string>
- <string>15.ImportedFromIB2</string>
<string>150.IBPluginDependency</string>
<string>151.IBPluginDependency</string>
<string>152.IBPluginDependency</string>
@@ -1930,109 +1960,70 @@
<string>155.IBPluginDependency</string>
<string>155.IBShouldRemoveOnLegacySave</string>
<string>16.IBPluginDependency</string>
- <string>16.ImportedFromIB2</string>
<string>17.CustomClassName</string>
<string>17.IBPluginDependency</string>
- <string>17.ImportedFromIB2</string>
<string>18.IBPluginDependency</string>
- <string>18.ImportedFromIB2</string>
<string>21.IBPluginDependency</string>
- <string>21.ImportedFromIB2</string>
<string>22.IBPluginDependency</string>
- <string>22.ImportedFromIB2</string>
<string>23.IBPluginDependency</string>
- <string>23.ImportedFromIB2</string>
<string>24.IBPluginDependency</string>
- <string>24.ImportedFromIB2</string>
<string>25.IBPluginDependency</string>
- <string>25.ImportedFromIB2</string>
<string>26.IBPluginDependency</string>
- <string>26.ImportedFromIB2</string>
<string>27.IBPluginDependency</string>
- <string>27.ImportedFromIB2</string>
<string>28.IBPluginDependency</string>
- <string>28.ImportedFromIB2</string>
<string>29.IBPluginDependency</string>
- <string>29.ImportedFromIB2</string>
<string>30.IBPluginDependency</string>
- <string>30.ImportedFromIB2</string>
<string>31.IBPluginDependency</string>
- <string>31.ImportedFromIB2</string>
<string>32.CustomClassName</string>
<string>32.IBPluginDependency</string>
- <string>32.ImportedFromIB2</string>
<string>33.IBPluginDependency</string>
- <string>33.ImportedFromIB2</string>
<string>34.IBPluginDependency</string>
- <string>34.ImportedFromIB2</string>
<string>35.IBPluginDependency</string>
- <string>35.ImportedFromIB2</string>
<string>36.CustomClassName</string>
<string>36.IBPluginDependency</string>
- <string>36.ImportedFromIB2</string>
<string>37.IBPluginDependency</string>
- <string>37.ImportedFromIB2</string>
<string>5.IBPluginDependency</string>
- <string>5.ImportedFromIB2</string>
<string>6.IBPluginDependency</string>
- <string>6.ImportedFromIB2</string>
<string>7.IBPluginDependency</string>
- <string>7.ImportedFromIB2</string>
<string>72.IBPluginDependency</string>
- <string>72.ImportedFromIB2</string>
<string>76.IBPluginDependency</string>
- <string>76.ImportedFromIB2</string>
<string>8.IBPluginDependency</string>
- <string>8.ImportedFromIB2</string>
- <string>9.IBEditorWindowLastContentRect</string>
<string>9.IBPluginDependency</string>
<string>9.IBWindowTemplateEditedContentRect</string>
- <string>9.ImportedFromIB2</string>
- <string>9.windowTemplate.hasMaxSize</string>
- <string>9.windowTemplate.hasMinSize</string>
- <string>9.windowTemplate.maxSize</string>
- <string>9.windowTemplate.minSize</string>
<string>96.IBPluginDependency</string>
- <string>96.ImportedFromIB2</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>AIAutoScrollView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>AIMessageEntryTextView</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>AIMessageEntryTextView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>AIMessageEntryTextView</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2044,86 +2035,49 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>AILocalizationTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>AIAutoScrollView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>AILocalizationTextField</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{0, 328}, {403, 517}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{0, 328}, {403, 517}}</string>
- <boolean value="YES"/>
- <boolean value="YES"/>
More information about the commits
mailing list