[Xfce4-commits] <midori:master> Leave writable folders unset in private/ app mode

[Christian Dywan]

Updating branch refs/heads/master
         to 6776bb960a04415e5d7e37e3e193d8e46e8d0d06 (commit)
       from 7b8bd49ae4ca6c13f1144f3946ec555157fc5d0b (commit)

commit 6776bb960a04415e5d7e37e3e193d8e46e8d0d06
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Sep 28 19:00:49 2012 +0200

    Leave writable folders unset in private/ app mode

 katze/midori-paths.vala |    5 -----
 tests/browser.c         |    2 +-
 tests/extensions.c      |    3 +--
 tests/speeddial.vala    |    2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/katze/midori-paths.vala b/katze/midori-paths.vala
index 16efc73..d60f242 100644
--- a/katze/midori-paths.vala
+++ b/katze/midori-paths.vala
@@ -72,11 +72,6 @@ namespace Midori {
                     exec_path, "profile", "tmp");
             }
             else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
-                /* Use mock folders in development builds */
-                if ("." in MIDORI_VERSION_SUFFIX)
-                    config_dir = cache_dir = user_data_dir = config_base;
-                else
-                    config_dir = cache_dir = user_data_dir = "/";
                 readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
                     Environment.get_user_config_dir (), PACKAGE_NAME);
                 tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S,
diff --git a/tests/browser.c b/tests/browser.c
index cee7917..59dc076 100644
--- a/tests/browser.c
+++ b/tests/browser.c
@@ -143,7 +143,7 @@ main (int    argc,
 {
     g_test_init (&argc, &argv, NULL);
     midori_app_setup (&argc, &argv, NULL, NULL);
-    midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
+    midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
 
     g_object_set_data (G_OBJECT (webkit_get_default_session ()),
                        "midori-session-initialized", (void*)1);
diff --git a/tests/extensions.c b/tests/extensions.c
index 75251f0..97f85af 100644
--- a/tests/extensions.c
+++ b/tests/extensions.c
@@ -195,7 +195,7 @@ main (int    argc,
 {
     g_test_init (&argc, &argv, NULL);
     midori_app_setup (&argc, &argv, NULL, NULL);
-    midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, NULL);
+    midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, NULL);
     soup_session_add_feature_by_type (webkit_get_default_session (),
         SOUP_TYPE_COOKIE_JAR);
 
@@ -204,7 +204,6 @@ main (int    argc,
 
     if (g_module_supported ())
     {
-        const gchar* filename;
         GDir* extension_dir = g_dir_open (EXTENSION_PATH, 0, NULL);
         g_assert (extension_dir != NULL);
 
diff --git a/tests/speeddial.vala b/tests/speeddial.vala
index 513f0b5..813ccc0 100644
--- a/tests/speeddial.vala
+++ b/tests/speeddial.vala
@@ -84,7 +84,7 @@ void main (string[] args) {
     string temporary_cache = DirUtils.make_tmp ("cacheXXXXXX");
     Environment.set_variable ("XDG_CACHE_HOME", temporary_cache, true);
     Test.init (ref args);
-    Midori.Paths.init (Midori.RuntimeMode.PRIVATE, null);
+    Midori.Paths.init (Midori.RuntimeMode.NORMAL, null);
     Test.add_func ("/speeddial/load", speeddial_load);
     Test.run ();
     DirUtils.remove (temporary_cache);