[gnome-power-manager] Remove schema version
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] Remove schema version
- Date: Thu, 18 Nov 2010 20:05:03 +0000 (UTC)
commit f060274b216a506b3f328468ee659e11e9d4a9e5
Author: Richard Hughes <richard hughsie com>
Date: Thu Nov 18 20:03:27 2010 +0000
Remove schema version
It doesn't make sense in a GSettings world.
data/org.gnome.power-manager.gschema.migrate | 1 -
data/org.gnome.power-manager.gschema.xml | 5 -----
src/gpm-common.h | 2 --
src/gpm-manager.c | 15 ---------------
4 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/data/org.gnome.power-manager.gschema.migrate b/data/org.gnome.power-manager.gschema.migrate
index efcee4d..4f62245 100644
--- a/data/org.gnome.power-manager.gschema.migrate
+++ b/data/org.gnome.power-manager.gschema.migrate
@@ -9,7 +9,6 @@ brightness-ac" = /apps/gnome-power-manager/backlight/brightness_ac
button-suspend = /apps/gnome-power-manager/buttons/suspend
button-hibernate = /apps/gnome-power-manager/buttons/hibernate
button-power = /apps/gnome-power-manager/buttons/power
-schema-version = /apps/gnome-power-manager/general/installed_schema
use-profile-time = /apps/gnome-power-manager/general/use_profile_time
use-time-for-policy = /apps/gnome-power-manager/general/use_time_for_policy
lock-use-screensaver = /apps/gnome-power-manager/lock/use_screensaver_settings
diff --git a/data/org.gnome.power-manager.gschema.xml b/data/org.gnome.power-manager.gschema.xml
index 0ea10a1..fa2f584 100644
--- a/data/org.gnome.power-manager.gschema.xml
+++ b/data/org.gnome.power-manager.gschema.xml
@@ -47,11 +47,6 @@
<summary>LCD brightness when on AC</summary>
<description>The brightness of the display when on AC power. Possible values are between 0.0 and 1.0.</description>
</key>
- <key name="schema-version" type="i">
- <default>3</default>
- <summary>The default configuration version.</summary>
- <description>The version of the installed version of the schema. Do not edit this value, it is used so that configure changes between versions can be detected.</description>
- </key>
<key name="use-profile-time" type="b">
<default>true</default>
<summary>If the learnt profile should be used to calculate the time remaining</summary>
diff --git a/src/gpm-common.h b/src/gpm-common.h
index d71f211..8285b6c 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
#define GPM_FAQ_URL "http://live.gnome.org/GnomePowerManager/Faq"
/* change general/installed_schema whenever adding or moving keys */
-#define GPM_SETTINGS_SCHEMA_ID 3
#define GPM_SETTINGS_SCHEMA "org.gnome.power-manager"
#define GSD_SETTINGS_SCHEMA "org.gnome.settings-daemon.plugins.power"
@@ -72,7 +71,6 @@ G_BEGIN_DECLS
#define GSD_SETTINGS_BUTTON_POWER "button-power"
/* general */
-#define GPM_SETTINGS_SCHEMA_VERSION "schema-version"
#define GPM_SETTINGS_USE_TIME_POLICY "use-time-for-policy"
#define GPM_SETTINGS_USE_PROFILE_TIME "use-profile-time"
#define GPM_SETTINGS_NETWORKMANAGER_SLEEP "network-sleep"
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 62f1e78..4a38b2b 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -2262,21 +2262,6 @@ gpm_manager_init (GpmManager *manager)
/* use libnotify */
notify_init (GPM_NAME);
- /* check to see if the user has installed the schema properly */
- version = g_settings_get_int (manager->priv->settings, GPM_SETTINGS_SCHEMA_VERSION);
- if (version != GPM_SETTINGS_SCHEMA_ID) {
- gpm_manager_notify (manager, &manager->priv->notification_general,
- /* TRANSLATORS: there was in install problem */
- _("Install problem!"),
- /* TRANSLATORS: the GConf schema was not installed properly */
- _("The configuration defaults for GNOME Power Manager have not been installed correctly.\n"
- "Please contact your computer administrator."),
- GPM_MANAGER_NOTIFY_TIMEOUT_LONG,
- GTK_STOCK_DIALOG_WARNING,
- NOTIFY_URGENCY_NORMAL);
- g_error ("no GSettings schema installed!");
- }
-
/* coldplug so we are in the correct state at startup */
g_object_get (manager->priv->client,
"on-battery", &manager->priv->on_battery,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]