[Xfce4-commits] <midori:master> Move portable setup code path down

[Christian Dywan]

Updating branch refs/heads/master
         to 8bf93fcad0cfd04e7e2d1736cf1f7bdacb0fbb31 (commit)
       from 910e2d4842130004ebd5a63d3223e115404fec0e (commit)

commit 8bf93fcad0cfd04e7e2d1736cf1f7bdacb0fbb31
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Mon Aug 27 23:36:44 2012 +0200

    Move portable setup code path down

 midori/main.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 2e4ef81..e87ab92 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -2216,12 +2216,6 @@ main (int    argc,
         }
         else if (webapp)
             midori_paths_init (MIDORI_RUNTIME_MODE_APP, config ? config : "app://");
-        else if (portable)
-        {
-            g_object_set (gtk_settings_get_default (),
-                "gtk-recent-files-max-age", 0, NULL);
-            midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, "portable://");
-        }
 
         midori_load_soup_session (settings);
         if (block_uris)
@@ -2334,8 +2328,16 @@ main (int    argc,
     if (inactivity_reset > 0)
         g_error ("--inactivity-reset is currently only supported with --app.");
 
-    midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config);
-        app = midori_app_new ();
+    if (portable)
+    {
+        g_object_set (gtk_settings_get_default (),
+            "gtk-recent-files-max-age", 0, NULL);
+        midori_paths_init (MIDORI_RUNTIME_MODE_PORTABLE, "portable://");
+    }
+    else
+        midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config);
+
+    app = midori_app_new ();
     katze_assign (config, g_strdup (midori_paths_get_config_dir ()));
     midori_startup_timer ("App created: \t%f");