adium 5798:1ffb90e7ff18: AIInterfaceController's protocol now ha...

commits at adium.im commits at adium.im
Fri Dec 6 12:43:58 UTC 2013


details:	http://hg.adium.im/adium/rev/1ffb90e7ff18
revision:	5798:1ffb90e7ff18
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Fri Dec 06 13:42:42 2013 +0100

AIInterfaceController's protocol now has an even longer variant of -displayQuestion: which does not make the window key. The OTR "Continue logging?" question is non-key, so people who are typing don't accidentially activate any of the buttons.
Subject: adium 5799:5261256c1905: Merged.

details:	http://hg.adium.im/adium/rev/5261256c1905
revision:	5799:5261256c1905
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Fri Dec 06 13:43:29 2013 +0100

Merged.

diffs (truncated from 2548 to 1000 lines):

diff -r dc2b2cd67a0b -r 5261256c1905 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Fri Dec 06 13:11:01 2013 +0100
+++ b/Adium.xcodeproj/project.pbxproj	Fri Dec 06 13:43:29 2013 +0100
@@ -1033,7 +1033,7 @@
 		5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
 		5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
 		5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
-		5A4BD44813F8575900A4D3F7 /* Preferences-Encryption.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */; };
+		5A4BD44813F8575900A4D3F7 /* Preferences-OTREncryption.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26513B42A55002D7265 /* Preferences-OTREncryption.xib */; };
 		5A4BD45D13F857DE00A4D3F7 /* Preferences-MessageAlerts.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */; };
 		5A4BD47313F858EE00A4D3F7 /* Preferences-ContactList.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */; };
 		5A4BD48913F859EF00A4D3F7 /* Preferences-WindowHandling.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */; };
@@ -4013,7 +4013,7 @@
 		5A9A9F8A11F295EB00328DF9 /* events-do-nothing.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-do-nothing.tiff"; path = "Resources/events-do-nothing.tiff"; sourceTree = SOURCE_ROOT; };
 		5AA2A0ED14B3EFF500B4DB65 /* AIOSCompatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOSCompatibility.h; path = "Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h"; sourceTree = "<group>"; };
 		5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-AddressBookIntegration.xib"; path = "Resources/Preferences-AddressBookIntegration.xib"; sourceTree = "<group>"; };
-		5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Encryption.xib"; path = "Resources/Preferences-Encryption.xib"; sourceTree = "<group>"; };
+		5AC7F26513B42A55002D7265 /* Preferences-OTREncryption.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-OTREncryption.xib"; path = "Resources/Preferences-OTREncryption.xib"; sourceTree = "<group>"; };
 		5AC7F26713B43612002D7265 /* Preferences-MessageAlerts.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-MessageAlerts.xib"; path = "Resources/Preferences-MessageAlerts.xib"; sourceTree = "<group>"; };
 		5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIButtonWithCursor.h; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.h"; sourceTree = "<group>"; };
 		5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIButtonWithCursor.m; path = "Frameworks/AIUtilities Framework/Source/AIButtonWithCursor.m"; sourceTree = "<group>"; };
@@ -5221,7 +5221,7 @@
 		341BD5530965E90A00CF83F5 /* OTR */ = {
 			isa = PBXGroup;
 			children = (
-				5AC7F26513B42A55002D7265 /* Preferences-Encryption.xib */,
+				5AC7F26513B42A55002D7265 /* Preferences-OTREncryption.xib */,
 				341BD5690965E9A500CF83F5 /* AdiumOTREncryption.h */,
 				341BD56A0965E9A500CF83F5 /* AdiumOTREncryption.m */,
 				341BD56E0965EC3500CF83F5 /* OTRFingerprintDetailsWindow.xib */,
@@ -9926,7 +9926,7 @@
 				5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */,
 				5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */,
 				5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */,
-				5A4BD44813F8575900A4D3F7 /* Preferences-Encryption.xib in Resources */,
+				5A4BD44813F8575900A4D3F7 /* Preferences-OTREncryption.xib in Resources */,
 				5A4BD45D13F857DE00A4D3F7 /* Preferences-MessageAlerts.xib in Resources */,
 				5A4BD47313F858EE00A4D3F7 /* Preferences-ContactList.xib in Resources */,
 				5A4BD48913F859EF00A4D3F7 /* Preferences-WindowHandling.xib in Resources */,
diff -r dc2b2cd67a0b -r 5261256c1905 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Fri Dec 06 13:11:01 2013 +0100
+++ b/ChangeLogs/Changes.txt	Fri Dec 06 13:43:29 2013 +0100
@@ -6,6 +6,7 @@
   * "Retina Display" support
   * Updated to libpurple x.y.z.
     * Added SASL authentication support. (#14478)
+  * Updated OTR support based on libotr 4
 
  Accessibility
   * Fixed tabs not being spoken by VoiceOver. (#16088)
@@ -19,37 +20,49 @@
   * Fixed an issue with contact list animation during search. (#16018)
 
  Off-the-record (OTR) messaging support
+  * Updated to libotr 4.0.0. (#16145)
+  * Added support for the Socialist Millionaire Protocol (SMP). (#9768)
+  * Added a dialogue forcing to select whether to log chats or not when OTR is enabled. (#15729)
+  * Fixed issues causing OTR to not work via Bonjour. (#16445)
+  * Added ability to manually verify contacts when they are not connected. (#16546)
   * Fixed an issue where the default encryption setting was not applied to newly-added contacts. (#13915)
+  * Made text selectable in the "Show Fingerprint" window. (#15082)
 
  "Retina Display" support
-  * Added high-resolution assets. (#15931, ##16067)
+  * Added high-resolution assets. (#15931, #16067)
   * Fixed high-resolution assets not being scaled correctly in context menus. (#16143)
   * Added for support for high-resolution emoticons in the Message View. (Detmud) (#16221)
   * Fixed visual glitches on bottom tabs. (#16074)
   * Fixed visual glitches affecting the Transcript Viewer search bar. (#16053)
 
  Plugins
-  * Added support for adding image upload services. (#15865) (Félix Cloutier)
+  * Added support for adding image upload services. (Félix Cloutier) (#15865)
 
  Preferences
   * Changed preferences layout to resemble OS X's System Preferences.
   * Moved a bunch of preferences around for more consistency dissolving the "Advanced" preference pane and its sub-sections.
   * Made Privacy Settings a preference pane. (#8307)
   * Made the Xtras Manager a preference pane.
-  * Renamed the "Personal" preference pane to "Profile". (#16105) (Paul Wilde)
+  * Renamed the "Personal" preference pane to "Profile". (Paul Wilde) (#16105)
   * Contact list: Added a preference for maximum contact list height. (#4815)
   * General: Removed "Send Messages with:" option. (#15369)
   * General: Simplified "Confirmations" settings. (#16436)
-  * Accounts: Added a signup or about button to each account setup pane. (#3792) (Ariel Chinn)
+  * Accounts: Added a signup or about button to each account setup pane. (Ariel Chinn) (#3792)
+
+ Security
+  * Added a "Tor (SOCKS5)" proxy option, which uses the Tor proxy option of libpurple. (#15161)
+  * Sandboxed message styles. (#15324)
+  * Fixed DNS leaks in libpurple. (#15161)
+  * Fixed registration of XMPP (Jabber) accounts to respect all account settings. Previously, Adium bypassed proxy settings. (#15957)
 
  Transcript Viewer
-  * Added full screen support. (##16120) (Paul Wilde)
+  * Added full screen support. (Paul Wilde) (#16120)
 
 ----
 
-  * Changed the behaviour of the contact list menu item in the dock to always bring it to the front instead of toggling its visibility. (#4848) (Aaron Dodson)
+  * Changed the behaviour of the contact list menu item in the dock to always bring it to the front instead of toggling its visibility. (Aaron Dodson) (#4848)
 
-  * Changed hotkey behaviour to hide Adium when pressed while Adium is active. (#4859) (Rafael Glauber)
+  * Changed hotkey behaviour to hide Adium when pressed while Adium is active. (Rafael Glauber) (#4859)
 
   * Yahoo: fixed ampersands being encoded mistakenly. (#13429)
 
@@ -58,9 +71,6 @@
 - "Allow /me action to be logged the way it is passed to the message view" (#13330)
 - "if an action ends in a colon, the colon will be emotified" (#14079)
 - "Improve "New Chat..." dialogue" (#14285)
-- Sandboxed message styles. (#15324)
-- Fixed DNS leaks in libpurple. / Added a "Tor (SOCKS5)" proxy option, which uses the Tor proxy option of libpurple. (#15161)
-- "Proxy bypass when registered jabber handle" (#15957)
 
 
 Version 1.5.9 (//2013)
diff -r dc2b2cd67a0b -r 5261256c1905 Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h	Fri Dec 06 13:11:01 2013 +0100
+++ b/Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h	Fri Dec 06 13:43:29 2013 +0100
@@ -372,6 +372,13 @@
 		  defaultButton:(NSString *)inDefaultButton alternateButton:(NSString *)inAlternateButton otherButton:(NSString *)inOtherButton suppression:(NSString *)inSuppression
 				 target:(id)inTarget selector:(SEL)inSelector userInfo:(id)inUserInfo;
 
+- (void)displayQuestion:(NSString *)inTitle withAttributedDescription:(NSAttributedString *)inDesc withWindowTitle:(NSString *)inWindowTitle
+		  defaultButton:(NSString *)inDefaultButton alternateButton:(NSString *)inAlternateButton otherButton:(NSString *)inOtherButton suppression:(NSString *)inSuppression
+				makeKey:(BOOL)key target:(id)inTarget selector:(SEL)inSelector userInfo:(id)inUserInfo;
+- (void)displayQuestion:(NSString *)inTitle withDescription:(NSString *)inDesc withWindowTitle:(NSString *)inWindowTitle
+		  defaultButton:(NSString *)inDefaultButton alternateButton:(NSString *)inAlternateButton otherButton:(NSString *)inOtherButton suppression:(NSString *)inSuppression
+				makeKey:(BOOL)key target:(id)inTarget selector:(SEL)inSelector userInfo:(id)inUserInfo;
+
 #pragma mark Synchronized Flashing
 - (void)registerFlashObserver:(id <AIFlashObserver>)inObserver;
 - (void)unregisterFlashObserver:(id <AIFlashObserver>)inObserver;
diff -r dc2b2cd67a0b -r 5261256c1905 Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m
--- a/Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m	Fri Dec 06 13:11:01 2013 +0100
+++ b/Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m	Fri Dec 06 13:43:29 2013 +0100
@@ -183,7 +183,6 @@
 
 - (void)show
 {
-	[self showWindow:nil];
 	[[self window] orderFront:nil];
 }
 
diff -r dc2b2cd67a0b -r 5261256c1905 Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m	Fri Dec 06 13:11:01 2013 +0100
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m	Fri Dec 06 13:43:29 2013 +0100
@@ -313,6 +313,7 @@
 												   alternateButton:AILocalizedString(@"Continue Logging", nil)
 													   otherButton:nil
 													   suppression:AILocalizedString(@"Don’t ask again", nil)
+														   makeKey:NO
 															target:self
 														  selector:@selector(logOTRQuestion:userInfo:suppression:)
 														  userInfo:inChat];
diff -r dc2b2cd67a0b -r 5261256c1905 Resources/Preferences-Encryption.xib
--- a/Resources/Preferences-Encryption.xib	Fri Dec 06 13:11:01 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">13A603</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
-		<string key="IBDocument.AppKitVersion">1265</string>
-		<string key="IBDocument.HIToolboxVersion">695.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">4514</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSButton</string>
-			<string>NSButtonCell</string>
-			<string>NSCustomObject</string>
-			<string>NSCustomView</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-			<string>NSPopUpButton</string>
-			<string>NSPopUpButtonCell</string>
-			<string>NSScrollView</string>
-			<string>NSScroller</string>
-			<string>NSSearchField</string>
-			<string>NSSearchFieldCell</string>
-			<string>NSTableColumn</string>
-			<string>NSTableHeaderView</string>
-			<string>NSTableView</string>
-			<string>NSTextField</string>
-			<string>NSTextFieldCell</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="475209783">
-			<object class="NSCustomObject" id="245285604">
-				<string key="NSClassName">ESOTRPreferences</string>
-			</object>
-			<object class="NSCustomObject" id="793451751">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="600731802">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomView" id="261192207">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">256</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSSearchField" id="590488253">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">265</int>
-						<string key="NSFrame">{{172, 20}, {153, 22}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="41604946"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSSearchFieldCell" key="NSCell" id="119300789">
-							<int key="NSCellFlags">342884416</int>
-							<int key="NSCellFlags2">272630848</int>
-							<string key="NSContents"/>
-							<object class="NSFont" key="NSSupport" id="970377140">
-								<string key="NSName">.LucidaGrandeUI</string>
-								<double key="NSSize">13</double>
-								<int key="NSfFlags">1044</int>
-							</object>
-							<string key="NSCellIdentifier">_NS:9</string>
-							<reference key="NSControlView" ref="590488253"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<int key="NSTextBezelStyle">1</int>
-							<object class="NSColor" key="NSBackgroundColor">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">textBackgroundColor</string>
-								<object class="NSColor" key="NSColor" id="399647140">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MQA</bytes>
-								</object>
-							</object>
-							<object class="NSColor" key="NSTextColor" id="1001647384">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlTextColor</string>
-								<object class="NSColor" key="NSColor" id="426572272">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MAA</bytes>
-								</object>
-							</object>
-							<object class="NSButtonCell" key="NSSearchButtonCell">
-								<int key="NSCellFlags">0</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">search</string>
-								<reference key="NSControlView" ref="590488253"/>
-								<string key="NSAction">_searchFieldSearch:</string>
-								<reference key="NSTarget" ref="119300789"/>
-								<int key="NSButtonFlags">138690560</int>
-								<int key="NSButtonFlags2">0</int>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-							<object class="NSButtonCell" key="NSCancelButtonCell">
-								<int key="NSCellFlags">0</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">clear</string>
-								<array class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
-									<dictionary class="NSMutableDictionary">
-										<string key="AXDescription">cancel</string>
-										<integer value="1" key="NSAccessibilityEncodedAttributesValueType"/>
-									</dictionary>
-								</array>
-								<reference key="NSControlView" ref="590488253"/>
-								<string key="NSAction">_searchFieldCancel:</string>
-								<reference key="NSTarget" ref="119300789"/>
-								<int key="NSButtonFlags">138690560</int>
-								<int key="NSButtonFlags2">0</int>
-								<string key="NSKeyEquivalent"/>
-								<int key="NSPeriodicDelay">400</int>
-								<int key="NSPeriodicInterval">75</int>
-							</object>
-							<int key="NSMaximumRecents">255</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
-					</object>
-					<object class="NSTextField" id="944557168">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{18, 189}, {149, 17}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="476167500"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="718859564">
-							<int key="NSCellFlags">68157504</int>
-							<int key="NSCellFlags2">71304192</int>
-							<string key="NSContents">Known Fingerprints:</string>
-							<reference key="NSSupport" ref="970377140"/>
-							<reference key="NSControlView" ref="944557168"/>
-							<object class="NSColor" key="NSBackgroundColor" id="1001302365">
-								<int key="NSColorSpace">6</int>
-								<string key="NSCatalogName">System</string>
-								<string key="NSColorName">controlColor</string>
-								<object class="NSColor" key="NSColor" id="698936443">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-								</object>
-							</object>
-							<reference key="NSTextColor" ref="1001647384"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
-					</object>
-					<object class="NSTextField" id="246614867">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{21, 271}, {149, 17}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="365143233"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="523338">
-							<int key="NSCellFlags">68157504</int>
-							<int key="NSCellFlags2">71304192</int>
-							<string key="NSContents">Private Keys:</string>
-							<reference key="NSSupport" ref="970377140"/>
-							<reference key="NSControlView" ref="246614867"/>
-							<reference key="NSBackgroundColor" ref="1001302365"/>
-							<reference key="NSTextColor" ref="1001647384"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
-					</object>
-					<object class="NSPopUpButton" id="365143233">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{173, 265}, {242, 26}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="346757463"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSPopUpButtonCell" key="NSCell" id="495829525">
-							<int key="NSCellFlags">-2076180416</int>
-							<int key="NSCellFlags2">2048</int>
-							<reference key="NSSupport" ref="970377140"/>
-							<reference key="NSControlView" ref="365143233"/>
-							<int key="NSButtonFlags">109199360</int>
-							<int key="NSButtonFlags2">1</int>
-							<object class="NSFont" key="NSAlternateImage" id="874098883">
-								<string key="NSName">LucidaGrande</string>
-								<double key="NSSize">13</double>
-								<int key="NSfFlags">16</int>
-							</object>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">400</int>
-							<int key="NSPeriodicInterval">75</int>
-							<object class="NSMenuItem" key="NSMenuItem" id="355447198">
-								<reference key="NSMenu" ref="433605837"/>
-								<string type="base64-UTF8" key="NSTitle">IA</string>
-								<string key="NSKeyEquiv"/>
-								<int key="NSKeyEquivModMask">1048576</int>
-								<int key="NSMnemonicLoc">2147483647</int>
-								<int key="NSState">1</int>
-								<object class="NSCustomResource" key="NSOnImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuCheckmark</string>
-								</object>
-								<object class="NSCustomResource" key="NSMixedImage">
-									<string key="NSClassName">NSImage</string>
-									<string key="NSResourceName">NSMenuMixedState</string>
-								</object>
-								<string key="NSAction">_popUpItemAction:</string>
-								<reference key="NSTarget" ref="495829525"/>
-							</object>
-							<bool key="NSMenuItemRespectAlignment">YES</bool>
-							<object class="NSMenu" key="NSMenu" id="433605837">
-								<object class="NSMutableString" key="NSTitle">
-									<characters key="NS.bytes">OtherViews</characters>
-								</object>
-								<array class="NSMutableArray" key="NSMenuItems">
-									<reference ref="355447198"/>
-								</array>
-							</object>
-							<int key="NSPreferredEdge">3</int>
-							<bool key="NSUsesItemFromMenu">YES</bool>
-							<bool key="NSAltersState">YES</bool>
-							<int key="NSArrowPosition">1</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="152864849">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{173, 236}, {407, 14}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="944557168"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="587033203">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">205520896</int>
-							<string key="NSContents">The private key is displayed here...</string>
-							<object class="NSFont" key="NSSupport" id="26">
-								<string key="NSName">.LucidaGrandeUI</string>
-								<double key="NSSize">11</double>
-								<int key="NSfFlags">3100</int>
-							</object>
-							<reference key="NSControlView" ref="152864849"/>
-							<reference key="NSBackgroundColor" ref="1001302365"/>
-							<reference key="NSTextColor" ref="1001647384"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
-					</object>
-					<object class="NSButton" id="346757463">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">270</int>
-						<string key="NSFrame">{{414, 261}, {111, 32}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="152864849"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="9745553">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">134217728</int>
-							<string key="NSContents">Regenerate</string>
-							<reference key="NSSupport" ref="970377140"/>
-							<reference key="NSControlView" ref="346757463"/>
-							<int key="NSButtonFlags">-2038284288</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="874098883"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSScrollView" id="476167500">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">274</int>
-						<array class="NSMutableArray" key="NSSubviews">
-							<object class="NSClipView" id="445790025">
-								<reference key="NSNextResponder" ref="476167500"/>
-								<int key="NSvFlags">2322</int>
-								<array class="NSMutableArray" key="NSSubviews">
-									<object class="NSTableView" id="712016614">
-										<reference key="NSNextResponder" ref="445790025"/>
-										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{403, 133}</string>
-										<reference key="NSSuperview" ref="445790025"/>
-										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="705249390"/>
-										<bool key="NSEnabled">YES</bool>
-										<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										<bool key="NSControlAllowsExpansionToolTips">YES</bool>
-										<object class="NSTableHeaderView" key="NSHeaderView" id="44990423">
-											<reference key="NSNextResponder" ref="146545853"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{403, 17}</string>
-											<reference key="NSSuperview" ref="146545853"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="445790025"/>
-											<reference key="NSTableView" ref="712016614"/>
-										</object>
-										<object class="_NSCornerView" key="NSCornerView" id="705249390">
-											<reference key="NSNextResponder" ref="476167500"/>
-											<int key="NSvFlags">-2147483392</int>
-											<string key="NSFrame">{{-22, 0}, {12, 17}}</string>
-											<reference key="NSSuperview" ref="476167500"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="146545853"/>
-										</object>
-										<array class="NSMutableArray" key="NSTableColumns">
-											<object class="NSTableColumn" id="493648427">
-												<string key="NSIdentifier">UID</string>
-												<double key="NSWidth">141</double>
-												<double key="NSMinWidth">40</double>
-												<double key="NSMaxWidth">1000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75497536</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Name</string>
-													<reference key="NSSupport" ref="26"/>
-													<object class="NSColor" key="NSBackgroundColor" id="217103147">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
-													</object>
-													<object class="NSColor" key="NSTextColor" id="263411744">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">headerTextColor</string>
-														<reference key="NSColor" ref="426572272"/>
-													</object>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="733576058">
-													<int key="NSCellFlags">337641536</int>
-													<int key="NSCellFlags2">2048</int>
-													<reference key="NSSupport" ref="970377140"/>
-													<reference key="NSControlView" ref="712016614"/>
-													<object class="NSColor" key="NSBackgroundColor" id="1055559834">
-														<int key="NSColorSpace">6</int>
-														<string key="NSCatalogName">System</string>
-														<string key="NSColorName">controlBackgroundColor</string>
-														<reference key="NSColor" ref="698936443"/>
-													</object>
-													<reference key="NSTextColor" ref="1001647384"/>
-												</object>
-												<int key="NSResizingMask">3</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<reference key="NSTableView" ref="712016614"/>
-											</object>
-											<object class="NSTableColumn" id="439814957">
-												<string key="NSIdentifier">Status</string>
-												<double key="NSWidth">255.66162109375</double>
-												<double key="NSMinWidth">40</double>
-												<double key="NSMaxWidth">1000</double>
-												<object class="NSTableHeaderCell" key="NSHeaderCell">
-													<int key="NSCellFlags">75497536</int>
-													<int key="NSCellFlags2">2048</int>
-													<string key="NSContents">Status</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSBackgroundColor" ref="217103147"/>
-													<reference key="NSTextColor" ref="263411744"/>
-												</object>
-												<object class="NSTextFieldCell" key="NSDataCell" id="131921218">
-													<int key="NSCellFlags">337641536</int>
-													<int key="NSCellFlags2">2048</int>
-													<reference key="NSSupport" ref="970377140"/>
-													<reference key="NSControlView" ref="712016614"/>
-													<reference key="NSBackgroundColor" ref="1055559834"/>
-													<reference key="NSTextColor" ref="1001647384"/>
-												</object>
-												<int key="NSResizingMask">3</int>
-												<bool key="NSIsResizeable">YES</bool>
-												<reference key="NSTableView" ref="712016614"/>
-											</object>
-										</array>
-										<double key="NSIntercellSpacingWidth">3</double>
-										<double key="NSIntercellSpacingHeight">2</double>
-										<reference key="NSBackgroundColor" ref="399647140"/>
-										<object class="NSColor" key="NSGridColor">
-											<int key="NSColorSpace">6</int>
-											<string key="NSCatalogName">System</string>
-											<string key="NSColorName">gridColor</string>
-											<object class="NSColor" key="NSColor">
-												<int key="NSColorSpace">3</int>
-												<bytes key="NSWhite">MC41AA</bytes>
-											</object>
-										</object>
-										<double key="NSRowHeight">17</double>
-										<int key="NSTvFlags">-692060160</int>
-										<reference key="NSDelegate"/>
-										<reference key="NSDataSource"/>
-										<int key="NSColumnAutoresizingStyle">4</int>
-										<int key="NSDraggingSourceMaskForLocal">15</int>
-										<int key="NSDraggingSourceMaskForNonLocal">0</int>
-										<bool key="NSAllowsTypeSelect">YES</bool>
-										<int key="NSTableViewDraggingDestinationStyle">0</int>
-										<int key="NSTableViewGroupRowStyle">1</int>
-									</object>
-								</array>
-								<string key="NSFrame">{{1, 17}, {403, 133}}</string>
-								<reference key="NSSuperview" ref="476167500"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="712016614"/>
-								<reference key="NSDocView" ref="712016614"/>
-								<reference key="NSBGColor" ref="1055559834"/>
-								<int key="NScvFlags">4</int>
-							</object>
-							<object class="NSScroller" id="849894620">
-								<reference key="NSNextResponder" ref="476167500"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{296, 17}, {11, 151}}</string>
-								<reference key="NSSuperview" ref="476167500"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="590488253"/>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<int key="NSsFlags">256</int>
-								<reference key="NSTarget" ref="476167500"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.9928057553956835</double>
-							</object>
-							<object class="NSScroller" id="293354221">
-								<reference key="NSNextResponder" ref="476167500"/>
-								<int key="NSvFlags">-2147483392</int>
-								<string key="NSFrame">{{1, 156}, {400, 11}}</string>
-								<reference key="NSSuperview" ref="476167500"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="849894620"/>
-								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-								<int key="NSsFlags">257</int>
-								<reference key="NSTarget" ref="476167500"/>
-								<string key="NSAction">_doScroller:</string>
-								<double key="NSPercent">0.99750623441396513</double>
-							</object>
-							<object class="NSClipView" id="146545853">
-								<reference key="NSNextResponder" ref="476167500"/>
-								<int key="NSvFlags">2338</int>
-								<array class="NSMutableArray" key="NSSubviews">
-									<reference ref="44990423"/>
-								</array>
-								<string key="NSFrame">{{1, 0}, {403, 17}}</string>
-								<reference key="NSSuperview" ref="476167500"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="44990423"/>
-								<reference key="NSDocView" ref="44990423"/>
-								<reference key="NSBGColor" ref="1055559834"/>
-								<int key="NScvFlags">4</int>
-							</object>
-							<reference ref="705249390"/>
-						</array>
-						<string key="NSFrame">{{172, 55}, {405, 151}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="445790025"/>
-						<int key="NSsFlags">133682</int>
-						<reference key="NSVScroller" ref="849894620"/>
-						<reference key="NSHScroller" ref="293354221"/>
-						<reference key="NSContentView" ref="445790025"/>
-						<reference key="NSHeaderClipView" ref="146545853"/>
-						<reference key="NSCornerView" ref="705249390"/>
-						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
-						<double key="NSMinMagnification">0.25</double>
-						<double key="NSMaxMagnification">4</double>
-						<double key="NSMagnification">1</double>
-					</object>
-					<object class="NSButton" id="953884195">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{503, 13}, {80, 32}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="893620119">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">134217728</int>
-							<string key="NSContents">Delete</string>
-							<reference key="NSSupport" ref="970377140"/>
-							<reference key="NSControlView" ref="953884195"/>
-							<int key="NSButtonFlags">-2038284288</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="874098883"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSButton" id="41604946">
-						<reference key="NSNextResponder" ref="261192207"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{417, 13}, {86, 32}}</string>
-						<reference key="NSSuperview" ref="261192207"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="953884195"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="830856661">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">134217728</int>
-							<string key="NSContents">Show...</string>
-							<reference key="NSSupport" ref="970377140"/>
-							<reference key="NSControlView" ref="41604946"/>
-							<int key="NSButtonFlags">-2038284288</int>
-							<int key="NSButtonFlags2">1</int>
-							<reference key="NSAlternateImage" ref="874098883"/>
-							<string key="NSAlternateContents"/>
-							<object class="NSMutableString" key="NSKeyEquivalent">
-								<characters key="NS.bytes"/>
-							</object>
-							<int key="NSPeriodicDelay">200</int>
-							<int key="NSPeriodicInterval">25</int>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-				</array>
-				<string key="NSFrameSize">{600, 309}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="246614867"/>
-				<object class="NSMutableString" key="NSClassName">
-					<characters key="NS.bytes">NSView</characters>
-				</object>
-				<string key="NSExtension">NSResponder</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<bool key="usesAutoincrementingIDs">NO</bool>
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="261192207"/>
-					</object>
-					<string key="id">37</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">button_showFingerprint</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="41604946"/>
-					</object>
-					<string key="id">38</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">textField_privateKey</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="152864849"/>
-					</object>
-					<string key="id">40</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">popUp_accounts</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="365143233"/>
-					</object>
-					<string key="id">41</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showFingerprint:</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="41604946"/>
-					</object>
-					<string key="id">45</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">button_generate</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="346757463"/>
-					</object>
-					<string key="id">47</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">generate:</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="346757463"/>
-					</object>
-					<string key="id">48</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">button_forgetFingerprint</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="953884195"/>
-					</object>
-					<string key="id">65</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">forgetFingerprint:</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="953884195"/>
-					</object>
-					<string key="id">66</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">label_knownFingerprints</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="944557168"/>
-					</object>
-					<string key="id">72</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">label_privateKeys</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="246614867"/>
-					</object>
-					<string key="id">73</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">filter:</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="590488253"/>
-					</object>
-					<string key="id">77</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">field_filter</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="590488253"/>
-					</object>
-					<string key="id">78</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">tableView_fingerprints</string>
-						<reference key="source" ref="245285604"/>
-						<reference key="destination" ref="712016614"/>
-					</object>
-					<string key="id">39</string>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">view_anchorToLeftSide</string>
-						<reference key="source" ref="346757463"/>
-						<reference key="destination" ref="365143233"/>
-					</object>
-					<string key="id">74</string>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<string key="id">0</string>
-						<array key="object" id="0"/>
-						<reference key="children" ref="475209783"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-2</string>
-						<reference key="object" ref="245285604"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-1</string>
-						<reference key="object" ref="793451751"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">-3</string>
-						<reference key="object" ref="600731802"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">5</string>
-						<reference key="object" ref="261192207"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="365143233"/>
-							<reference ref="152864849"/>
-							<reference ref="246614867"/>
-							<reference ref="953884195"/>
-							<reference ref="41604946"/>
-							<reference ref="590488253"/>
-							<reference ref="476167500"/>
-							<reference ref="944557168"/>
-							<reference ref="346757463"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">18</string>
-						<reference key="object" ref="365143233"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="495829525"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">25</string>
-						<reference key="object" ref="152864849"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="587033203"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">26</string>
-						<reference key="object" ref="476167500"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="849894620"/>
-							<reference ref="293354221"/>
-							<reference ref="44990423"/>
-							<reference ref="712016614"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">35</string>
-						<reference key="object" ref="41604946"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="830856661"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">46</string>
-						<reference key="object" ref="346757463"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="9745553"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">51</string>
-						<reference key="object" ref="495829525"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="433605837"/>
-						</array>
-						<reference key="parent" ref="365143233"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">53</string>
-						<reference key="object" ref="587033203"/>
-						<reference key="parent" ref="152864849"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">55</string>
-						<reference key="object" ref="830856661"/>
-						<reference key="parent" ref="41604946"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">56</string>
-						<reference key="object" ref="9745553"/>
-						<reference key="parent" ref="346757463"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">19</string>
-						<reference key="object" ref="433605837"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="355447198"/>
-						</array>
-						<reference key="parent" ref="495829525"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">22</string>
-						<reference key="object" ref="355447198"/>
-						<reference key="parent" ref="433605837"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">59</string>
-						<reference key="object" ref="849894620"/>
-						<reference key="parent" ref="476167500"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">60</string>
-						<reference key="object" ref="293354221"/>
-						<reference key="parent" ref="476167500"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">61</string>
-						<reference key="object" ref="44990423"/>
-						<reference key="parent" ref="476167500"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">62</string>
-						<reference key="object" ref="953884195"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="893620119"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">63</string>
-						<reference key="object" ref="893620119"/>
-						<reference key="parent" ref="953884195"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">67</string>
-						<reference key="object" ref="246614867"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="523338"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">68</string>
-						<reference key="object" ref="523338"/>
-						<reference key="parent" ref="246614867"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">69</string>
-						<reference key="object" ref="944557168"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="718859564"/>
-						</array>
-						<reference key="parent" ref="261192207"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">70</string>
-						<reference key="object" ref="718859564"/>
-						<reference key="parent" ref="944557168"/>
-					</object>
-					<object class="IBObjectRecord">
-						<string key="id">75</string>


More information about the commits mailing list