debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christian Dywan 2010-08-07 15:14:58 +02:00
parent 2d1d19de23
commit 13ffa17f2b
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
midori/main.c
View file

@ -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");