From dcb209aa2ca7d918af85cb4d97fa9e4ed245ce7f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 8 Aug 2012 08:53:22 -0700
Subject: [PATCH] Remove about/release notes on OSX 10.6.

---
 DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h  |   3 +
 DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m  |   6 +
 .../DNSCrypt/en.lproj/DNSCrypt.xib            | 201 +++---------------
 3 files changed, 39 insertions(+), 171 deletions(-)

diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h
index adab670..003bbf7 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h
@@ -32,6 +32,9 @@ typedef enum {
 @interface DNSCrypt : NSPreferencePane {
     AuthorizationRef auth;
 }
+@property (assign) IBOutlet NSTabView *tabView;
+@property (assign) IBOutlet NSTabViewItem *aboutTabViewItem;
+@property (assign) IBOutlet NSTabViewItem *releaseNotesTabViewItem;
 
 @property (strong) IBOutlet NSButton *dnscryptButton;
 @property (strong) IBOutlet NSButton *opendnsButton;
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
index 1ea7eec..7a0f754 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m
@@ -298,6 +298,12 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
     NSString *feedbackURLText = @"http://dnscrypt.opendns.com/feedback.php";
     [[_feedbackWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:feedbackURLText]]];
 
+    SInt32 OSXversionMajor, OSXversionMinor;
+    if (Gestalt(gestaltSystemVersionMajor, &OSXversionMajor) != noErr || Gestalt(gestaltSystemVersionMinor, &OSXversionMinor) != noErr || OSXversionMajor < 10 || OSXversionMinor < 7) {
+        [_tabView removeTabViewItem: _aboutTabViewItem];
+        [_tabView removeTabViewItem:_releaseNotesTabViewItem];
+        return;
+    }
     [_releaseNotesWebView setDrawsBackground:false];
     [_releaseNotesWebView setShouldUpdateWhileOffscreen:true];
     [_releaseNotesWebView setUIDelegate:self];
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
index d33d1a6..222503a 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/en.lproj/DNSCrypt.xib
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
 		<string key="IBDocument.SystemVersion">12A269</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2818</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2829</string>
 		<string key="IBDocument.AppKitVersion">1187</string>
 		<string key="IBDocument.HIToolboxVersion">624.00</string>
 		<dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="com.apple.InterfaceBuilder.CocoaPlugin">2818</string>
-			<string key="com.apple.WebKitIBPlugin">1804</string>
+			<string key="com.apple.InterfaceBuilder.CocoaPlugin">2829</string>
+			<string key="com.apple.WebKitIBPlugin">1809</string>
 		</dictionary>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSBox</string>
@@ -64,7 +64,6 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrame">{{13, 10}, {563, 359}}</string>
 							<reference key="NSSuperview" ref="1037298196"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="1025762247"/>
 							<string key="NSReuseIdentifierKey">_NS:461</string>
 							<array class="NSMutableArray" key="NSTabViewItems">
@@ -79,7 +78,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 238}, {204, 22}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="300098131"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -115,7 +113,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 212}, {245, 24}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="891532389"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -142,7 +139,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 157}, {244, 22}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="384170040"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -173,7 +169,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{15, 133}, {204, 22}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="240318099"/>
 												<string key="NSReuseIdentifierKey">_NS:239</string>
 												<bool key="NSEnabled">YES</bool>
@@ -200,7 +195,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{14, 96}, {176, 19}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="496861916"/>
 												<string key="NSReuseIdentifierKey">_NS:3936</string>
 												<bool key="NSEnabled">YES</bool>
@@ -241,7 +235,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{54, 284}, {72, 19}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="908408940"/>
 												<string key="NSReuseIdentifierKey">_NS:3936</string>
 												<bool key="NSEnabled">YES</bool>
@@ -266,7 +259,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{14, -3}, {240, 83}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="855319081"/>
 												<string key="NSReuseIdentifierKey">_NS:3596</string>
 												<bool key="NSEnabled">YES</bool>
@@ -296,7 +288,6 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{115, 283}, {125, 19}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="894789954"/>
 												<string key="NSReuseIdentifierKey">_NS:3596</string>
 												<bool key="NSEnabled">YES</bool>
@@ -334,7 +325,6 @@
 												</set>
 												<string key="NSFrame">{{302, 222}, {224, 88}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="487940586"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSImageCell" key="NSCell" id="107747299">
@@ -365,7 +355,6 @@
 												</set>
 												<string key="NSFrame">{{17, 277}, {32.395949255088134, 32.395949255088134}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="372048088"/>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSImageCell" key="NSCell" id="336811923">
@@ -388,7 +377,6 @@
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{269.5, 2}, {4, 300}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="429164099"/>
 												<string key="NSReuseIdentifierKey">_NS:1557</string>
 												<string key="NSOffsets">{0, 0}</string>
@@ -425,7 +413,7 @@
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{323, 190}, {183, 32}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="821865429"/>
 												<string key="NSReuseIdentifierKey">_NS:2419</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="675161177">
@@ -471,7 +459,6 @@
 												</set>
 												<string key="NSFrame">{{302, 2}, {224, 192}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView"/>
 												<string key="NSReuseIdentifierKey">_NS:51</string>
 												<string key="FrameName"/>
@@ -492,7 +479,6 @@
 												<int key="NSvFlags">12</int>
 												<string key="NSFrame">{{17, 193}, {240, 5}}</string>
 												<reference key="NSSuperview" ref="1025762247"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="410495287"/>
 												<string key="NSReuseIdentifierKey">_NS:2411</string>
 												<string key="NSOffsets">{0, 0}</string>
@@ -515,7 +501,6 @@
 										</array>
 										<string key="NSFrame">{{10, 33}, {543, 313}}</string>
 										<reference key="NSSuperview" ref="821865429"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="423755939"/>
 										<string key="NSReuseIdentifierKey">_NS:463</string>
 									</object>
@@ -675,7 +660,6 @@
 					</array>
 					<string key="NSFrameSize">{589, 375}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="821865429"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1366, 746}}</string>
@@ -825,6 +809,30 @@
 					</object>
 					<int key="connectionID">372</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutTabViewItem</string>
+						<reference key="source" ref="294453543"/>
+						<reference key="destination" ref="820989392"/>
+					</object>
+					<int key="connectionID">376</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">releaseNotesTabViewItem</string>
+						<reference key="source" ref="294453543"/>
+						<reference key="destination" ref="615953595"/>
+					</object>
+					<int key="connectionID">383</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tabView</string>
+						<reference key="source" ref="294453543"/>
+						<reference key="destination" ref="821865429"/>
+					</object>
+					<int key="connectionID">384</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1235,158 +1243,9 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">372</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">DNSCrypt</string>
-					<string key="superclassName">NSPreferencePane</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="dnscryptButtonPressed:">NSButton</string>
-						<string key="fallbackButtonPressed:">NSButton</string>
-						<string key="familyShieldButtonPressed:">NSButton</string>
-						<string key="openDNSLinkPushed:">NSButton</string>
-						<string key="opendnsButtonPressed:">NSButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="dnscryptButtonPressed:">
-							<string key="name">dnscryptButtonPressed:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBActionInfo" key="fallbackButtonPressed:">
-							<string key="name">fallbackButtonPressed:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBActionInfo" key="familyShieldButtonPressed:">
-							<string key="name">familyShieldButtonPressed:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBActionInfo" key="openDNSLinkPushed:">
-							<string key="name">openDNSLinkPushed:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBActionInfo" key="opendnsButtonPressed:">
-							<string key="name">opendnsButtonPressed:</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="aboutWebView">WebView</string>
-						<string key="currentResolverTextField">NSTextField</string>
-						<string key="dnscryptButton">NSButton</string>
-						<string key="fallbackButton">NSButton</string>
-						<string key="familyShieldButton">NSButton</string>
-						<string key="feedbackWebView">WebView</string>
-						<string key="opendnsButton">NSButton</string>
-						<string key="previewNotesWebView">WebView</string>
-						<string key="releaseNotesWebView">WebView</string>
-						<string key="statusImageView">NSImageView</string>
-						<string key="statusText">NSTextField</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="aboutWebView">
-							<string key="name">aboutWebView</string>
-							<string key="candidateClassName">WebView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="currentResolverTextField">
-							<string key="name">currentResolverTextField</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dnscryptButton">
-							<string key="name">dnscryptButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="fallbackButton">
-							<string key="name">fallbackButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="familyShieldButton">
-							<string key="name">familyShieldButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="feedbackWebView">
-							<string key="name">feedbackWebView</string>
-							<string key="candidateClassName">WebView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="opendnsButton">
-							<string key="name">opendnsButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="previewNotesWebView">
-							<string key="name">previewNotesWebView</string>
-							<string key="candidateClassName">WebView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="releaseNotesWebView">
-							<string key="name">releaseNotesWebView</string>
-							<string key="candidateClassName">WebView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="statusImageView">
-							<string key="name">statusImageView</string>
-							<string key="candidateClassName">NSImageView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="statusText">
-							<string key="name">statusText</string>
-							<string key="candidateClassName">NSTextField</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/DNSCrypt.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSPreferencePane</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="_firstKeyView">NSView</string>
-						<string key="_initialKeyView">NSView</string>
-						<string key="_lastKeyView">NSView</string>
-						<string key="_window">NSWindow</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="_firstKeyView">
-							<string key="name">_firstKeyView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="_initialKeyView">
-							<string key="name">_initialKeyView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="_lastKeyView">
-							<string key="name">_lastKeyView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="_window">
-							<string key="name">_window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NSPreferencePane.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">WebView</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">reloadFromOrigin:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">reloadFromOrigin:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">reloadFromOrigin:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/WebView.h</string>
-					</object>
-				</object>
-			</array>
+			<int key="maxID">384</int>
 		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">