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

Move portable setup code path down

Browse source
This commit is contained in:
Paweł Forysiuk 2012-08-27 23:36:44 +02:00 committed by Christian Dywan
parent 910e2d4842
commit 8bf93fcad0
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
midori/main.c
View file

@ -2216,12 +2216,6 @@ main (int argc,
} }
else if (webapp) else if (webapp)
midori_paths_init (MIDORI_RUNTIME_MODE_APP, config ? config : "app://"); 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); midori_load_soup_session (settings);
if (block_uris) if (block_uris)
@ -2334,8 +2328,16 @@ main (int argc,
if (inactivity_reset > 0) if (inactivity_reset > 0)
g_error ("--inactivity-reset is currently only supported with --app."); g_error ("--inactivity-reset is currently only supported with --app.");
midori_paths_init (MIDORI_RUNTIME_MODE_NORMAL, config); if (portable)
app = midori_app_new (); {
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 ())); katze_assign (config, g_strdup (midori_paths_get_config_dir ()));
midori_startup_timer ("App created: \t%f"); midori_startup_timer ("App created: \t%f");