0.14

DNSCrypt-Menubar/DNSCrypt-Menubar/DNSCrypt-Menubar-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.13 (beta)</string>
+	<string>0.14 (beta)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.13</string>
+	<string>0.14</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

DNSCrypt-OSX-Installer/DNSCrypt-OSX-Installer.pkgproj

@@ -1241,7 +1241,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<true/>
 				<key>VERSION</key>
-				<string>0.13</string>
+				<string>0.14</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1734,7 +1734,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<true/>
 				<key>VERSION</key>
-				<string>0.13</string>
+				<string>0.14</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>

DNSCrypt-OSX-Installer/sign.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-VERSION='0.13'
+VERSION='0.14'
 
 cd build || exit 1
 (
@@ -16,11 +16,11 @@ done
 rm -fr DNSCrypt-OSX.mpkg
 productsign --sign 'Developer ID Application' DNSCrypt.mpkg DNSCrypt-OSX.mpkg
 zip -9 -r "dnscrypt-osx-client-${VERSION}.zip" DNSCrypt-OSX.mpkg
-rm -fr dstroot
+rm -fr dnscrypt-pkg
 rm -f "dnscrypt-osx-client-${VERSION}.dmg"
-mkdir dstroot
-mv DNSCrypt-OSX.mpkg dstroot
-hdiutil create "dnscrypt-osx-client-${VERSION}.dmg" -srcfolder dstroot
+mkdir dnscrypt-pkg
+mv DNSCrypt-OSX.mpkg dnscrypt-pkg
+hdiutil create "dnscrypt-osx-client-${VERSION}.dmg" -srcfolder dnscrypt-pkg
 
-mv dstroot/DNSCrypt-OSX.mpkg .
-rm -fr dstroot
+mv dnscrypt-pkg/DNSCrypt-OSX.mpkg .
+rm -fr dnscrypt-pkg

DNSCrypt-Preference-Pane/DNSCrypt.xcodeproj/project.pbxproj

@@ -294,7 +294,7 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -317,7 +317,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_ENABLE_OBJC_GC = supported;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;

DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.13</string>
+	<string>0.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.13</string>
+	<string>0.14</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2011-2012 OpenDNS Inc. All rights reserved.</string>
 	<key>NSMainNibFile</key>

DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.h

@@ -9,7 +9,7 @@
 #import <PreferencePanes/PreferencePanes.h>
 #import <WebKit/WebKit.h>
 
-#define kDNSCRYPT_PACKAGE_VERSION @"0.13"
+#define kDNSCRYPT_PACKAGE_VERSION @"0.14"
 
 #define kDNSCRYPT_PREFPANE_APP_PATH @"/Library/PreferencePanes/DNSCrypt.prefPane"
 #define kDNSCRYPT_USR_BASE_DIR kDNSCRYPT_PREFPANE_APP_PATH @"/Contents/Resources/usr"
@@ -32,22 +32,22 @@ typedef enum {
 @interface DNSCrypt : NSPreferencePane {
     AuthorizationRef auth;
 }
-@property (assign) IBOutlet NSTabView *tabView;
-@property (assign) IBOutlet NSTabViewItem *aboutTabViewItem;
-@property (assign) IBOutlet NSTabViewItem *releaseNotesTabViewItem;
+@property (nonatomic, retain) IBOutlet NSTabView *tabView;
+@property (nonatomic, retain) IBOutlet NSTabViewItem *aboutTabViewItem;
+@property (nonatomic, retain) IBOutlet NSTabViewItem *releaseNotesTabViewItem;
 
-@property (strong) IBOutlet NSButton *dnscryptButton;
-@property (strong) IBOutlet NSButton *opendnsButton;
-@property (strong) IBOutlet NSButton *familyShieldButton;
-@property (strong) IBOutlet NSButton *fallbackButton;
+@property (nonatomic, retain) IBOutlet NSButton *dnscryptButton;
+@property (nonatomic, retain) IBOutlet NSButton *opendnsButton;
+@property (nonatomic, retain) IBOutlet NSButton *familyShieldButton;
+@property (nonatomic, retain) IBOutlet NSButton *fallbackButton;
 
-@property (strong) IBOutlet NSTextField *currentResolverTextField;
-@property (strong) IBOutlet NSImageView *statusImageView;
-@property (strong) IBOutlet NSTextField *statusText;
-@property (strong) IBOutlet WebView *previewNotesWebView;
-@property (strong) IBOutlet WebView *releaseNotesWebView;
-@property (strong) IBOutlet WebView *feedbackWebView;
-@property (strong) IBOutlet WebView *aboutWebView;
+@property (nonatomic, retain) IBOutlet NSTextField *currentResolverTextField;
+@property (nonatomic, retain) IBOutlet NSImageView *statusImageView;
+@property (nonatomic, retain) IBOutlet NSTextField *statusText;
+@property (nonatomic, retain) IBOutlet WebView *previewNotesWebView;
+@property (nonatomic, retain) IBOutlet WebView *releaseNotesWebView;
+@property (nonatomic, retain) IBOutlet WebView *feedbackWebView;
+@property (nonatomic, retain) IBOutlet WebView *aboutWebView;
 
 - (void) mainViewDidLoad;
 

DNSCrypt-Preference-Pane/DNSCrypt/DNSCrypt.m

@@ -9,6 +9,10 @@
 #import "DNSCrypt.h"
 
 @implementation DNSCrypt
+@synthesize tabView = _tabView;
+@synthesize aboutTabViewItem = _aboutTabViewItem;
+@synthesize releaseNotesTabViewItem = _releaseNotesTabViewItem;
+
 @synthesize previewNotesWebView = _previewNotesWebView;
 @synthesize releaseNotesWebView = _releaseNotesWebView;
 @synthesize feedbackWebView = _feedbackWebView;
@@ -299,22 +303,31 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
     [[_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];
+    if (Gestalt(gestaltSystemVersionMajor, &OSXversionMajor) != noErr || Gestalt(gestaltSystemVersionMinor, &OSXversionMinor) != noErr || OSXversionMajor < 10 || OSXversionMinor < 6) {
         return;
     }
     [_releaseNotesWebView setDrawsBackground:false];
     [_releaseNotesWebView setShouldUpdateWhileOffscreen:true];
     [_releaseNotesWebView setUIDelegate:self];
-    NSURL *releaseNotesURL = [NSURL fileURLWithPath: [[NSBundle bundleForClass:[self class]] pathForResource: @"html/releasenotes" ofType: @"html"] isDirectory: NO];
-    [[_releaseNotesWebView mainFrame] loadRequest:[NSURLRequest requestWithURL: releaseNotesURL]];
+    
+    NSURL *releaseNotesURL;
+    NSString *releaseNotesURLPath = [[NSBundle bundleForClass: [self class]] pathForResource: @"releasenotes" ofType: @"html" inDirectory: @"html"];
+    if (! releaseNotesURLPath || ! (releaseNotesURL = [NSURL fileURLWithPath:  releaseNotesURLPath])) {
+        [_tabView removeTabViewItem:_releaseNotesTabViewItem];
+    } else {
+        [[_releaseNotesWebView mainFrame] loadRequest:[NSURLRequest requestWithURL: releaseNotesURL]];
+    }
 
     [_aboutWebView setDrawsBackground:false];
     [_aboutWebView setShouldUpdateWhileOffscreen:true];
     [_aboutWebView setUIDelegate:self];
-    NSURL *aboutURL = [NSURL fileURLWithPath: [[NSBundle bundleForClass:[self class]] pathForResource: @"html/about" ofType: @"html"] isDirectory: NO];
-    [[_aboutWebView mainFrame] loadRequest:[NSURLRequest requestWithURL: aboutURL]];
+    NSURL *aboutURL;
+    NSString *aboutURLPath = [[NSBundle bundleForClass: [self class]] pathForResource: @"about" ofType: @"html" inDirectory: @"html"];
+    if (! aboutURLPath || ! (aboutURL = [NSURL fileURLWithPath: aboutURLPath])) {
+        [_tabView removeTabViewItem: _aboutTabViewItem];
+    } else {
+        [[_aboutWebView mainFrame] loadRequest:[NSURLRequest requestWithURL: aboutURL]];
+    }
 }
 
 - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element

DNSCrypt-Preference-Pane/DNSCrypt/extra/html/about.haml

@@ -14,8 +14,8 @@
   %body
     %h1 About DNSCrypt
     %p
-      This software encrypts DNS packets between your computer and
-      OpenDNS. This prevents man-in-the-middle attacks and snooping of DNS
+      This software encrypts and authenticates DNS packets between your computer
+      and OpenDNS. This prevents man-in-the-middle attacks and snooping of DNS
       traffic by ISPs or others.
     %p
       Tips:

DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.haml

@@ -20,12 +20,18 @@
             style: italic
   %body
     %h1 Release Notes
+
+    %article
+      %h2 Version 0.14 released!
+      %time Wed, 08 Aug 2012
+      %ul
+        %li The preference pane can now run on OSX 10.6.
+
     %article
       %h2 Version 0.13 released!
       %time Wed, 08 Aug 2012
       %ul
         %li The DNS cache is now flushed after a configuration change.
-        %li Compatibility with OSX 10.6 has been improved.
         %li
           The release notes are now bundled with the preference pane.
           This reduces the startup time and ensures that these notes are

DNSCrypt-Preference-Pane/DNSCrypt/extra/html/releasenotes.html

@@ -23,12 +23,18 @@
   </head>
   <body>
     <h1>Release Notes</h1>
+    <article>
+      <h2>Version 0.14 released!</h2>
+      <time>Wed, 08 Aug 2012</time>
+      <ul>
+        <li>The preference pane can now run on OSX 10.6.</li>
+      </ul>
+    </article>
     <article>
       <h2>Version 0.13 released!</h2>
       <time>Wed, 08 Aug 2012</time>
       <ul>
         <li>The DNS cache is now flushed after a configuration change.</li>
-        <li>Compatibility with OSX 10.6 has been improved.</li>
         <li>
           The release notes are now bundled with the preference pane.
           This reduces the startup time and ensures that these notes are