[recipes] gsettings: Make schema id == app id
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] gsettings: Make schema id == app id
- Date: Wed, 8 Mar 2017 11:24:55 +0000 (UTC)
commit 34eb99c643621014cbfd399202283f63fe81d763
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Mar 8 06:23:24 2017 -0500
gsettings: Make schema id == app id
It seems an open question currently if gsettings schemas
should be exported from flatpak apps or not. If we end
up deciding that they should, then having the schema ID
already identical to the app ID will make things easy,
so lets do that while we still have the chance.
data/Makefile.am | 2 +-
...s.gschema.xml => org.gnome.Recipes.gschema.xml} | 2 +-
src/gr-cooking-page.c | 4 ++--
src/gr-recipe-store.c | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 2fe8a6a..fc82cce 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -277,7 +277,7 @@ EXTRA_DIST += $(appdata_in_files) appdata/org.gnome.Recipes.appdata.xml
searchproviderdir = $(datadir)/gnome-shell/search-providers
dist_searchprovider_DATA = org.gnome.Recipes-search-provider.ini
-gsettings_SCHEMAS = org.gnome.recipes.gschema.xml
+gsettings_SCHEMAS = org.gnome.Recipes.gschema.xml
@GSETTINGS_RULES@
diff --git a/data/org.gnome.recipes.gschema.xml b/data/org.gnome.Recipes.gschema.xml
similarity index 96%
rename from data/org.gnome.recipes.gschema.xml
rename to data/org.gnome.Recipes.gschema.xml
index a39b446..5bc517e 100644
--- a/data/org.gnome.recipes.gschema.xml
+++ b/data/org.gnome.Recipes.gschema.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
- <schema path="/org/gnome/recipes/" id="org.gnome.recipes" gettext-domain="gnome-recipes">
+ <schema path="/org/gnome/recipes/" id="org.gnome.Recipes" gettext-domain="gnome-recipes">
<key type="s" name="user">
<default>''</default>
diff --git a/src/gr-cooking-page.c b/src/gr-cooking-page.c
index 71182f0..8c0aabf 100644
--- a/src/gr-cooking-page.c
+++ b/src/gr-cooking-page.c
@@ -94,14 +94,14 @@ gr_cooking_page_init (GrCookingPage *self)
static guint
get_cooking_overlay_count (void)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
return g_settings_get_uint (settings, "cooking");
}
static void
set_cooking_overlay_count (uint count)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
g_settings_set_uint (settings, "cooking", count);
}
diff --git a/src/gr-recipe-store.c b/src/gr-recipe-store.c
index ed35146..eac21a5 100644
--- a/src/gr-recipe-store.c
+++ b/src/gr-recipe-store.c
@@ -582,7 +582,7 @@ load_picks (GrRecipeStore *self,
static void
load_favorites (GrRecipeStore *self)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
gint64 timestamp;
self->favorites = g_settings_get_strv (settings, "favorites");
@@ -593,7 +593,7 @@ load_favorites (GrRecipeStore *self)
static void
save_favorites (GrRecipeStore *self)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
gint64 timestamp;
g_settings_set_strv (settings, "favorites", (const char * const *)self->favorites);
@@ -604,7 +604,7 @@ save_favorites (GrRecipeStore *self)
static void
load_shopping (GrRecipeStore *self)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
g_autoptr(GVariant) value = NULL;
gint64 timestamp;
@@ -618,7 +618,7 @@ load_shopping (GrRecipeStore *self)
static void
save_shopping (GrRecipeStore *self)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
g_autoptr(GVariant) value = NULL;
gint64 timestamp;
@@ -794,7 +794,7 @@ save_chefs (GrRecipeStore *store)
static void
save_user (GrRecipeStore *self)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
g_settings_set_string (settings, "user", self->user ? self->user : "");
}
@@ -802,7 +802,7 @@ static void
load_user (GrRecipeStore *self,
const char *dir)
{
- g_autoptr(GSettings) settings = g_settings_new ("org.gnome.recipes");
+ g_autoptr(GSettings) settings = g_settings_new ("org.gnome.Recipes");
g_autofree char *user = g_settings_get_string (settings, "user");
if (user[0] == '\0') {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]