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

Move config folder validity check in front of app run

Browse source
This commit is contained in:
Christian Dywan 2011-04-04 22:47:22 +02:00
parent 2ffd780bb6
commit b2092cc64b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
midori/main.c
View file

@ -1905,6 +1905,13 @@ main (int argc,
/* libSoup uses threads, so we need to initialize threads. */ /* libSoup uses threads, so we need to initialize threads. */
if (!g_thread_supported ()) g_thread_init (NULL); if (!g_thread_supported ()) g_thread_init (NULL);
sokoke_register_stock_items (); sokoke_register_stock_items ();
if (config && !g_path_is_absolute (config))
{
g_critical (_("The specified configuration folder is invalid."));
return 1;
}
if (webapp && config) if (webapp && config)
g_set_application_name (_("Midori (Private Browsing)")); g_set_application_name (_("Midori (Private Browsing)"));
else else
@ -2084,11 +2091,6 @@ main (int argc,
if (run) if (run)
return midori_run_script (uris ? *uris : NULL); return midori_run_script (uris ? *uris : NULL);
if (config && !g_path_is_absolute (config))
{
g_critical (_("The specified configuration folder is invalid."));
return 1;
}
sokoke_set_config_dir (config); sokoke_set_config_dir (config);
if (config) if (config)
{ {