main: Remove GSettings override for plugin priority

There's a default value already available in the plugin file itself.

https://bugzilla.gnome.org/show_bug.cgi?id=772370

3 files changed, 6 insertions, 61 deletions

diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 46344631..05f568b3 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -178,29 +178,6 @@ on_plugin_deactivated (GnomeSettingsPluginInfo *info,
 }
 
 static gboolean
-is_schema (const char *schema)
-{
-        GSettingsSchemaSource *source = NULL;
-        gchar **non_relocatable = NULL;
-        gchar **relocatable = NULL;
-        gboolean installed = FALSE;
-
-        source = g_settings_schema_source_get_default ();
-        if (!source)
-                return FALSE;
-
-        g_settings_schema_source_list_schemas (source, TRUE, &non_relocatable, &relocatable);
-
-        if (g_strv_contains ((const gchar * const *)non_relocatable, schema) ||
-            g_strv_contains ((const gchar * const *)relocatable, schema))
-                installed = TRUE;
-
-        g_strfreev (non_relocatable);
-        g_strfreev (relocatable);
-        return installed;
-}
-
-static gboolean
 is_whitelisted (char       **whitelist,
                 const char  *plugin_name)
 {
@@ -247,19 +224,13 @@ _load_file (GnomeSettingsManager *manager,
                                     gnome_settings_plugin_info_get_location (info));
 
         /* Ignore unknown schemas or else we'll assert */
-        if (is_schema (key_name)) {
-                manager->priv->plugins = g_slist_prepend (manager->priv->plugins,
-                                                          g_object_ref (info));
-
-                g_signal_connect (info, "activated",
-                                  G_CALLBACK (on_plugin_activated), manager);
-                g_signal_connect (info, "deactivated",
-                                  G_CALLBACK (on_plugin_deactivated), manager);
+        manager->priv->plugins = g_slist_prepend (manager->priv->plugins,
+                                                  g_object_ref (info));
 
-                gnome_settings_plugin_info_set_settings_prefix (info, key_name);
-        } else {
-                g_warning ("Ignoring unknown module '%s'", key_name);
-        }
+        g_signal_connect (info, "activated",
+                          G_CALLBACK (on_plugin_activated), manager);
+        g_signal_connect (info, "deactivated",
+                          G_CALLBACK (on_plugin_deactivated), manager);
 
         /* Priority is set in the call above */
         g_free (key_name);
diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.c b/gnome-settings-daemon/gnome-settings-plugin-info.c
index 51d0379e..72fb97ad 100644
--- a/gnome-settings-daemon/gnome-settings-plugin-info.c
+++ b/gnome-settings-daemon/gnome-settings-plugin-info.c
@@ -280,19 +280,6 @@ gnome_settings_plugin_info_new_from_file (const char *filename)
         return info;
 }
 
-void
-gnome_settings_plugin_info_set_settings_prefix (GnomeSettingsPluginInfo *info,
-                                                const char              *settings_prefix)
-{
-        int priority;
-
-        info->priv->settings = g_settings_new (settings_prefix);
-
-        priority = g_settings_get_int (info->priv->settings, "priority");
-        if (priority > 0)
-                info->priv->priority = priority;
-}
-
 static void
 _deactivate_plugin (GnomeSettingsPluginInfo *info)
 {
@@ -486,12 +473,3 @@ gnome_settings_plugin_info_get_priority (GnomeSettingsPluginInfo *info)
 
         return info->priv->priority;
 }
-
-void
-gnome_settings_plugin_info_set_priority (GnomeSettingsPluginInfo *info,
-                                         int                      priority)
-{
-        g_return_if_fail (GNOME_IS_SETTINGS_PLUGIN_INFO (info));
-
-        info->priv->priority = priority;
-}
diff --git a/gnome-settings-daemon/gnome-settings-plugin-info.h b/gnome-settings-daemon/gnome-settings-plugin-info.h
index 8dd024f0..a0933736 100644
--- a/gnome-settings-daemon/gnome-settings-plugin-info.h
+++ b/gnome-settings-daemon/gnome-settings-plugin-info.h
@@ -50,7 +50,6 @@ GType            gnome_settings_plugin_info_get_type           (void) G_GNUC_CON
 
 GnomeSettingsPluginInfo *gnome_settings_plugin_info_new_from_file (const char *filename);
 
-void             gnome_settings_plugin_info_set_settings_prefix (GnomeSettingsPluginInfo *info, const char *settings_prefix);
 gboolean         gnome_settings_plugin_info_activate        (GnomeSettingsPluginInfo *info);
 gboolean         gnome_settings_plugin_info_deactivate      (GnomeSettingsPluginInfo *info);
 
@@ -65,9 +64,6 @@ const char      *gnome_settings_plugin_info_get_copyright   (GnomeSettingsPlugin
 const char      *gnome_settings_plugin_info_get_location    (GnomeSettingsPluginInfo *info);
 int              gnome_settings_plugin_info_get_priority    (GnomeSettingsPluginInfo *info);
 
-void             gnome_settings_plugin_info_set_priority    (GnomeSettingsPluginInfo *info,
-                                                             int                      priority);
-
 G_END_DECLS
 
 #endif  /* __GNOME_SETTINGS_PLUGIN_INFO_H__ */