From b1872da75d1bc549081bfa61c6761dc033989eb9 Mon Sep 17 00:00:00 2001
From: Xhacker Liu <liu.dongyuan@gmail.com>
Date: Sun, 22 Jun 2014 23:23:15 -0700
Subject: [PATCH] Switch to RHPreferences to avoid a crash.

---
 Podfile                                       | 2 +-
 Podfile.lock                                  | 6 +++---
 menubar-webkit/LDYPreferencesViewController.h | 4 ++--
 menubar-webkit/LDYPreferencesViewController.m | 4 ++--
 menubar-webkit/LDYWebViewDelegate.m           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Podfile b/Podfile
index c80626a..29d05a3 100644
--- a/Podfile
+++ b/Podfile
@@ -1,4 +1,4 @@
 platform :osx, '10.9'
 
 pod 'MASShortcut',  '~> 1.2.3'
-pod 'MASPreferences', '~> 1.1'
+pod 'RHPreferences', :head
diff --git a/Podfile.lock b/Podfile.lock
index 076ddfc..8936a8a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,13 +1,13 @@
 PODS:
-  - MASPreferences (1.1)
   - MASShortcut (1.2.3)
+  - RHPreferences (HEAD based on 1.0.0)
 
 DEPENDENCIES:
-  - MASPreferences (~> 1.1)
   - MASShortcut (~> 1.2.3)
+  - RHPreferences (HEAD)
 
 SPEC CHECKSUMS:
-  MASPreferences: 971d03da4b3818f8ea0d0ef10b86b02b2c052d17
   MASShortcut: e5e47bf0367e77f2c4089b4edc4c8143f3106eed
+  RHPreferences: d0215102b7b8cd9f501655e5e7db2551ef4dc0e5
 
 COCOAPODS: 0.33.1
diff --git a/menubar-webkit/LDYPreferencesViewController.h b/menubar-webkit/LDYPreferencesViewController.h
index fce475e..c3dc588 100644
--- a/menubar-webkit/LDYPreferencesViewController.h
+++ b/menubar-webkit/LDYPreferencesViewController.h
@@ -7,9 +7,9 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <MASPreferencesWindowController.h>
+#import <RHPreferences.h>
 
-@interface LDYPreferencesViewController : NSViewController <MASPreferencesViewController>
+@interface LDYPreferencesViewController : NSViewController <RHPreferencesViewControllerProtocol>
 
 - (instancetype)initWithIdentifier:(NSString *)identifier
                       toolbarImage:(NSImage *)image
diff --git a/menubar-webkit/LDYPreferencesViewController.m b/menubar-webkit/LDYPreferencesViewController.m
index 5170ad3..8d2b720 100644
--- a/menubar-webkit/LDYPreferencesViewController.m
+++ b/menubar-webkit/LDYPreferencesViewController.m
@@ -14,9 +14,9 @@ static NSString * const kPreferencesDirectory = @"public/preferences/";
 
 @property (weak) IBOutlet WebView *webView;
 
-@property (nonatomic, copy) NSString *identifier;
+@property (nonatomic) NSString *identifier;
 @property (nonatomic) NSImage *toolbarItemImage;
-@property (nonatomic, copy) NSString *toolbarItemLabel;
+@property (nonatomic) NSString *toolbarItemLabel;
 
 @end
 
diff --git a/menubar-webkit/LDYWebViewDelegate.m b/menubar-webkit/LDYWebViewDelegate.m
index a5128dd..f8385b5 100644
--- a/menubar-webkit/LDYWebViewDelegate.m
+++ b/menubar-webkit/LDYWebViewDelegate.m
@@ -10,7 +10,7 @@
 #import "LDYPreferencesViewController.h"
 #import "LDYWebScriptObjectConverter.h"
 #import <MASShortcut+Monitoring.h>
-#import <MASPreferencesWindowController.h>
+#import <RHPreferences.h>
 
 static NSString * const kWebScriptNamespace = @"mw";
 
@@ -144,7 +144,7 @@ static NSString * const kWebScriptNamespace = @"mw";
 	}
 
     NSString *title = @"Preferences";
-    self.preferencesWindowController = [[MASPreferencesWindowController alloc] initWithViewControllers:viewControllers title:title];
+    self.preferencesWindowController = [[RHPreferencesWindowController alloc] initWithViewControllers:viewControllers andTitle:title];
 }
 
 - (void)openPreferences