[recipes] Remove support for uninstalled data
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Remove support for uninstalled data
- Date: Tue, 4 Apr 2017 02:08:31 +0000 (UTC)
commit f568d6202c9e90b9244617b86833eda284d324be
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Apr 3 21:49:15 2017 -0400
Remove support for uninstalled data
Running uninstalled does not work well with gsettings, and
will soon be less relevant when we are loading data from the
net.
src/gr-recipe-store.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/src/gr-recipe-store.c b/src/gr-recipe-store.c
index ff80826..9526c9a 100644
--- a/src/gr-recipe-store.c
+++ b/src/gr-recipe-store.c
@@ -913,26 +913,19 @@ gr_recipe_store_init (GrRecipeStore *self)
{
const char *data_dir;
const char *user_dir;
- g_autofree char *current_dir = NULL;
- g_autofree char *uninstalled_dir = NULL;
self->recipes = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
self->chefs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
data_dir = get_pkg_data_dir ();
user_dir = get_user_data_dir ();
- current_dir = g_get_current_dir ();
- uninstalled_dir = g_build_filename (current_dir, "data", NULL);
load_user (self, user_dir);
/* First load preinstalled data */
- if (!load_recipes (self, data_dir, TRUE))
- load_recipes (self, uninstalled_dir, TRUE);
- if (!load_chefs (self, data_dir, TRUE))
- load_chefs (self, uninstalled_dir, TRUE);
- if (!load_picks (self, data_dir))
- load_picks (self, uninstalled_dir);
+ load_recipes (self, data_dir, TRUE);
+ load_chefs (self, data_dir, TRUE);
+ load_picks (self, data_dir);
/* Now load saved data */
load_recipes (self, user_dir, FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]