Merge lp:~robert-ancell/unity-settings-daemon/no-gnome-shell into lp:unity-settings-daemon

[Robert Ancell]

Remove code for disabling plugin under GNOME Shell - they don't use u-s-d.

[Sebastien Bacher (seb128)]

great

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

This doesn't seem to merge anymore...

review: Needs Fixing

[Robert Ancell (robert-ancell)]

Seems to merge fine for me?!

[Sebastien Bacher (seb128)]

seems to merge fine here as well!

review: Approve

=== modified file 'gnome-settings-daemon/gnome-settings-plugin-info.c'
--- gnome-settings-daemon/gnome-settings-plugin-info.c	2013-11-13 01:45:23 +0000
+++ gnome-settings-daemon/gnome-settings-plugin-info.c	2016-03-15 20:31:14 +0000
@@ -395,21 +395,6 @@
                 goto out;
         }
 
-        if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "GNOME") == 0
-            && g_strcmp0 (info->priv->name, "Background") == 0) {
-
-                g_warning ("Disable background plugin when under gnome-shell");
-
-                g_object_unref (G_OBJECT (info->priv->module));
-                info->priv->module = NULL;
-
-                /* Mark plugin as unavailable */
-                info->priv->available = FALSE;
-
-                goto out;
-        }
-
-
         info->priv->plugin = GNOME_SETTINGS_PLUGIN (gnome_settings_module_new_object (GNOME_SETTINGS_MODULE (info->priv->module)));
 
         g_type_module_unuse (info->priv->module);