From 972be3627b8b6368a0e8c971ade7963ea7d459de Mon Sep 17 00:00:00 2001 From: Brent Hull Date: Thu, 1 Nov 2012 19:40:46 -0400 Subject: Remove unnecessary schema version check and some unused constants --- src/gpm-manager.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/gpm-manager.c') 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, -- cgit v1.2.1