From: Christian Dywan <christian@twotoasts.de>
Date: Sat, 7 Aug 2010 13:14:58 +0000 (+0200)
Subject: Correctly load settings and cookies with --config in app mode
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13ffa17f2bd4a00d0f0fd5e2f9709195f1b97555;p=midori

Correctly load settings and cookies with --config in app mode
---

diff --git a/midori/main.c b/midori/main.c
index 35ac8c78..1eabbcea 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1698,19 +1698,21 @@ main (int    argc,
         midori_startup_timer ("Browser: \t%f");
         if (config)
         {
-            gchar* random_name;
-            gchar* app_name;
+            SoupSession* session;
+            SoupCookieJar* jar;
 
-            random_name = g_strdup_printf ("app%u", g_random_int ());
-            app_name = g_strconcat ("midori", "_", random_name, NULL);
-            app = g_object_new (MIDORI_TYPE_APP, "name", app_name, NULL);
-            g_free (random_name);
-            g_free (app_name);
-
-            config_file = build_config_filename ("config");
+            config_file = g_build_filename (config, "config", NULL);
             settings = settings_new_from_file (config_file, &extensions);
             g_free (config_file);
             g_strfreev (extensions);
+
+            session = webkit_get_default_session ();
+            config_file = g_build_filename (config, "cookies.txt", NULL);
+            jar = soup_cookie_jar_text_new (config_file, TRUE);
+            g_free (config_file);
+            soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
+            g_object_unref (jar);
+
         }
         else
             settings = katze_object_get_object (browser, "settings");