Merge branch 'master' of github.com:appcelerator/titanium_desktop

appcelerator-archive · Oct 18, 2011 · 48958eb · 48958eb
2 parents 3ff6727 + 2dc2533
commit 48958eb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/kroll b/kroll
diff --git a/modules/ti.App/Properties.cpp b/modules/ti.App/Properties.cpp
@@ -261,6 +261,9 @@ void Properties::RemoveProperty(const ValueList& args, KValueRef result)
 {
     args.VerifyException("removeProperty", "s");
     result->SetBool(config->removeProperty(args.GetString(0)));
+    if (result) {
+        this->SaveConfig();
+    }
 }
 
 void Properties::ListProperties(const ValueList& args, KValueRef result)

diff --git a/modules/ti.UI/mac/WebViewDelegate.mm b/modules/ti.UI/mac/WebViewDelegate.mm
@@ -51,17 +51,6 @@ -(void)setupPreferences
 
     [[window webView] setPreferences:webPrefs];
     [webPrefs release];
-
-
-    // Store Web databases in our data directory.
-    // XXX(josh): does this work?
-    NSString* datadir = [NSString stringWithUTF8String:
-        Host::GetInstance()->GetApplication()->GetDataPath().c_str()];
-    NSUserDefaults* standardUserDefaults = [NSUserDefaults standardUserDefaults];
-    [standardUserDefaults
-        setObject:datadir
-        forKey:@"WebDatabaseDirectory"];
-    [standardUserDefaults synchronize];
 }
 
 -(id)initWithWindow:(NativeWindow*)inWindow