Unity Settings Daemon

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

  1. no-gnome-shell
  2. Merge into trunk
Proposed by Robert Ancell on 2016-03-15
Status: Merged
Approved by: Sebastien Bacher on 2016-05-23
Approved revision: 4133
Merged at revision: 4135
Proposed branch: lp:~robert-ancell/unity-settings-daemon/no-gnome-shell
Merge into: lp:unity-settings-daemon
Diff against target: 25 lines (+0/-15)
1 file modified
gnome-settings-daemon/gnome-settings-plugin-info.c (+0/-15)
To merge this branch: bzr merge lp:~robert-ancell/unity-settings-daemon/no-gnome-shell
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-03-15 Approve on 2016-05-23
Marco Trevisan (Treviño) Needs Fixing on 2016-05-14
Review via email: mp+289104@code.launchpad.net

Commit Message

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

great

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote :

This doesn't seem to merge anymore...

review: Needs Fixing
Robert Ancell (robert-ancell) wrote :

Seems to merge fine for me?!

Sebastien Bacher (seb128) wrote :

seems to merge fine here as well!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gnome-settings-daemon/gnome-settings-plugin-info.c'
2--- gnome-settings-daemon/gnome-settings-plugin-info.c 2013-11-13 01:45:23 +0000
3+++ gnome-settings-daemon/gnome-settings-plugin-info.c 2016-03-15 20:31:14 +0000
4@@ -395,21 +395,6 @@
5 goto out;
6 }
7
8- if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "GNOME") == 0
9- && g_strcmp0 (info->priv->name, "Background") == 0) {
10-
11- g_warning ("Disable background plugin when under gnome-shell");
12-
13- g_object_unref (G_OBJECT (info->priv->module));
14- info->priv->module = NULL;
15-
16- /* Mark plugin as unavailable */
17- info->priv->available = FALSE;
18-
19- goto out;
20- }
21-
22-
23 info->priv->plugin = GNOME_SETTINGS_PLUGIN (gnome_settings_module_new_object (GNOME_SETTINGS_MODULE (info->priv->module)));
24
25 g_type_module_unuse (info->priv->module);

Subscribers

People subscribed via source and target branches