diff options
| author | Brent Hull <[email protected]> | 2012-11-01 19:40:46 -0400 |
|---|---|---|
| committer | Brent Hull <[email protected]> | 2012-11-01 19:40:46 -0400 |
| commit | 972be3627b8b6368a0e8c971ade7963ea7d459de (patch) | |
| tree | 076ec7419159262e65f608da7a3dbccdd8ec3a5a | |
| parent | 1e0bea49d7d1959d063c6ab74c99500067236110 (diff) | |
| download | mate-power-manager-972be3627b8b6368a0e8c971ade7963ea7d459de.tar.bz2 mate-power-manager-972be3627b8b6368a0e8c971ade7963ea7d459de.tar.xz | |
Remove unnecessary schema version check and some unused constants
| -rw-r--r-- | data/org.mate.power-manager.gschema.xml.in | 5 | ||||
| -rw-r--r-- | src/gpm-common.h | 9 | ||||
| -rw-r--r-- | src/gpm-manager.c | 18 |
3 files changed, 2 insertions, 30 deletions
diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in index e423182..99ee820 100644 --- a/data/org.mate.power-manager.gschema.xml.in +++ b/data/org.mate.power-manager.gschema.xml.in @@ -126,11 +126,6 @@ <_summary>Laptop lid close action when on AC</_summary> <_description>The action to take when the laptop lid is closed and the laptop is on AC power.</_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-time-for-policy" type="b"> <default>true</default> <_summary>Whether to use time-based notifications</_summary> diff --git a/src/gpm-common.h b/src/gpm-common.h index 7b5822b..5cb0696 100644 --- a/src/gpm-common.h +++ b/src/gpm-common.h @@ -36,13 +36,7 @@ G_BEGIN_DECLS #define GPM_NAME _("Power Manager") #define GPM_DESCRIPTION _("Power Manager for the MATE desktop") -/* help location */ -#define GPM_HOMEPAGE_URL "http://www.gnome.org/projects/mate-power-manager/" -#define GPM_BUGZILLA_URL "http://bugzilla.gnome.org/buglist.cgi?product=mate-power-manager" -#define GPM_FAQ_URL "http://live.gnome.org/MatePowerManager/Faq" - -/* change general/installed_schema whenever adding or moving keys */ -#define GPM_SETTINGS_SCHEMA_ID 3 +/* schema location */ #define GPM_SETTINGS_SCHEMA "org.mate.power-manager" /* actions */ @@ -73,7 +67,6 @@ G_BEGIN_DECLS #define GPM_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_NETWORKMANAGER_SLEEP "network-sleep" #define GPM_SETTINGS_IDLE_CHECK_CPU "check-type-cpu" diff --git a/src/gpm-manager.c b/src/gpm-manager.c index b351b6f..6248b97 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -565,7 +565,7 @@ gpm_manager_sleep_failure (GpmManager *manager, gboolean is_suspend, const gchar egg_debug ("sleep failed"); gpm_manager_play (manager, GPM_MANAGER_SOUND_SUSPEND_ERROR, TRUE); - /* only emit if in MateConf */ + /* only emit if specified in settings */ if (!show_sleep_failed) goto out; @@ -1876,7 +1876,6 @@ gpm_manager_init (GpmManager *manager) gint timeout; DBusGConnection *connection; GError *error = NULL; - guint version; manager->priv = GPM_MANAGER_GET_PRIVATE (manager); connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); @@ -1910,21 +1909,6 @@ gpm_manager_init (GpmManager *manager) /* use libmatenotify */ 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 MateConf schema was not installed properly */ - _("The configuration defaults for MATE 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); - egg_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, |