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

Stop using magic test folder name

Browse source
This commit is contained in:
Christian Dywan 2012-08-28 19:37:21 +02:00
parent 503f1be5c5
commit 3fb42ef2d7
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/addons.c
View file

@ -1678,10 +1678,10 @@ addons_save_settings (MidoriApp* app,
config_dir = midori_extension_get_config_dir (extension); config_dir = midori_extension_get_config_dir (extension);
config_file = g_build_filename (config_dir, "addons", NULL); config_file = g_build_filename (config_dir, "addons", NULL);
if (config_dir != NULL)
katze_mkdir_with_parents (config_dir, 0700); katze_mkdir_with_parents (config_dir, 0700);
sokoke_key_file_save_to_file (keyfile, config_file, &error); sokoke_key_file_save_to_file (keyfile, config_file, &error);
/* If the folder is /, this is a test run, thus no error */ if (error && midori_extension_get_config_dir (extension) != NULL)
if (error && !g_str_equal (config_dir, "/"))
{ {
g_warning (_("The configuration of the extension '%s' couldn't be saved: %s\n"), g_warning (_("The configuration of the extension '%s' couldn't be saved: %s\n"),
_("User addons"), error->message); _("User addons"), error->message);

4
extensions/formhistory/formhistory.c
View file

@ -522,12 +522,12 @@ formhistory_activate_cb (MidoriExtension* extension,
formhistory_construct_popup_gui (priv); formhistory_construct_popup_gui (priv);
config_dir = midori_extension_get_config_dir (extension); config_dir = midori_extension_get_config_dir (extension);
if (config_dir != NULL)
katze_mkdir_with_parents (config_dir, 0700); katze_mkdir_with_parents (config_dir, 0700);
filename = g_build_filename (config_dir, "forms.db", NULL); filename = g_build_filename (config_dir, "forms.db", NULL);
if (sqlite3_open (filename, &db) != SQLITE_OK) if (sqlite3_open (filename, &db) != SQLITE_OK)
{ {
/* If the folder is /, this is a test run, thus no error */ if (config_dir != NULL)
if (!g_str_equal (midori_extension_get_config_dir (extension), "/"))
g_warning (_("Failed to open database: %s\n"), sqlite3_errmsg (db)); g_warning (_("Failed to open database: %s\n"), sqlite3_errmsg (db));
sqlite3_close (db); sqlite3_close (db);
} }

5
midori/midori-extension.c
View file

@ -646,10 +646,11 @@ midori_extension_get_config_dir (MidoriExtension* extension)
if (!extension->priv->config_dir) if (!extension->priv->config_dir)
{ {
gchar* filename = g_object_get_data (G_OBJECT (extension), "filename"); gchar* filename = g_object_get_data (G_OBJECT (extension), "filename");
if (!filename) if (filename != NULL)
return "/";
extension->priv->config_dir = g_build_filename ( extension->priv->config_dir = g_build_filename (
midori_paths_get_config_dir (), "extensions", filename, NULL); midori_paths_get_config_dir (), "extensions", filename, NULL);
else
extension->priv->config_dir = NULL;
} }
return extension->priv->config_dir; return extension->priv->config_dir;