Merge pull request #29 from staticlinuxpro/master

Yosemite White Menu-Icon, Convert to ARC

DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj

@@ -297,6 +297,8 @@
 		09A13AEC145F3B9000B227A4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -315,6 +317,8 @@
 		09A13AED145F3B9000B227A4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.h

@@ -8,7 +8,7 @@
 #define kDNSCRYPT_CONTROL_DIR kDNSCRYPT_VAR_BASE_DIR @"/control"
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
-    NSWindow *_window;
+    NSWindow *__weak _window;
     NSMenu *_dnscryptMenu;
     NSStatusItem *_statusItem;
     NSMenuItem *_versionMenuItem;
@@ -25,7 +25,7 @@ typedef enum {
 } DNSConfigurationState;
 
 @property (strong) NSStatusItem *statusItem;
-@property (assign) NSWindow *window;
+@property (weak) NSWindow *window;
 
 @property (strong) IBOutlet NSMenu *dnscryptMenu;
 @property (strong) IBOutlet NSMenuItem *versionMenuItem;

DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m

@@ -28,8 +28,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
     [task launch];
     data = [[pipe fileHandleForReading] readDataToEndOfFile];
     [task waitUntilExit];
-    [task release];
-    result = [[[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding] autorelease];
+    result = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
     if ([result hasSuffix: @"\n"]) {
         result = [result substringToIndex: result.length - 1];
     }
@@ -79,6 +78,7 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
         default:
             led = [NSImage imageNamed: @"icon-no-network"];
     }
+    [led setTemplate:YES];
     _statusItem.image = led;
 }
 
@@ -146,7 +146,6 @@ DNSConfigurationState currentState = kDNS_CONFIGURATION_UNKNOWN;
 - (void) awakeFromNib
 {
     _statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
-    [_statusItem retain];
     _statusItem.highlightMode = TRUE;
     _statusItem.toolTip = @"DNSCrypt";
     _statusItem.menu = _dnscryptMenu;

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

@@ -347,7 +347,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				GCC_ENABLE_OBJC_GC = no;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DNSCrypt/DNSCrypt-Prefix.pch";
 				GCC_VERSION = "";
@@ -368,7 +368,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				GCC_ENABLE_OBJC_GC = no;
+				GCC_ENABLE_OBJC_GC = unsupported;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DNSCrypt/DNSCrypt-Prefix.pch";
 				GCC_VERSION = "";