diff options
author | Ray Strode <rstrode@redhat.com> | 2012-11-13 17:30:01 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2012-11-15 13:03:22 -0500 |
commit | 4571d484f29fa59d12cfa83f74d782bfe68028cc (patch) | |
tree | 7e581234e67c856ba21cda2856e71b9d886cd568 | |
parent | 567f055df56cdab15aa53a07630566f796d0e891 (diff) | |
download | gdm-4571d484f29fa59d12cfa83f74d782bfe68028cc.tar.gz |
data: use new g-s-d's plugin whitelist
GDM tries to manually turn off unvetted or unwanted
gnome-settings-daemon plugins explicitly. This requires
close coordination between gdm and gnome-settings-daemon to
make sure the lists down get out of sync.
gnome-settings-daemon now supports having an explicit whitelist,
which is a much more robust way to handle our needs.
This commit changes GDM's dconf configuration to use the new whitelist
setting, instead of expliciting turning off each unwanted plugin.
https://bugzilla.gnome.org/show_bug.cgi?id=662220
-rw-r--r-- | data/00-upstream-settings | 61 | ||||
-rw-r--r-- | data/00-upstream-settings-locks | 22 |
2 files changed, 3 insertions, 80 deletions
diff --git a/data/00-upstream-settings b/data/00-upstream-settings index 3d955965..660a295d 100644 --- a/data/00-upstream-settings +++ b/data/00-upstream-settings @@ -34,38 +34,10 @@ session-name='gdm-shell' [org/gnome/desktop/sound] event-sounds=true -[org/gnome/settings-daemon/plugins/a11y-keyboard] -active=true - -[org/gnome/settings-daemon/plugins/a11y-settings] -active=false - -[org/gnome/settings-daemon/plugins/background] -active=true - -[org/gnome/settings-daemon/plugins/clipboard] -active=false - -[org/gnome/settings-daemon/plugins/color] -active=false - -[org/gnome/settings-daemon/plugins/cursor] -active=true - -[org/gnome/settings-daemon/plugins/font] -active=false - -[org/gnome/settings-daemon/plugins/gconf] -active=false - -[org/gnome/settings-daemon/plugins/housekeeping] -active=false - -[org/gnome/settings-daemon/plugins/keybindings] -active=false +[org/gnome/settings-daemon/plugins] +whitelisted-plugins=['a11y-keyboard', 'a11y-settings', 'background', 'clipboard', 'color', 'cursor', 'media-keys', 'orientation', 'power', 'sound', 'xrandr', 'xsettings'] [org/gnome/settings-daemon/plugins/media-keys] -active=true calculator='' eject='' email='' @@ -81,32 +53,3 @@ search='' stop='' www='' -[org/gnome/settings-daemon/plugins/mouse] -active=false - -[org/gnome/settings-daemon/plugins/orientation] -active=true - -[org/gnome/settings-daemon/plugins/power] -active=true - -[org/gnome/settings-daemon/plugins/print-notifications] -active=false - -[org/gnome/settings-daemon/plugins/smartcard] -active=false - -[org/gnome/settings-daemon/plugins/sound] -active=true - -[org/gnome/settings-daemon/plugins/updates] -active=false - -[org/gnome/settings-daemon/plugins/wacom] -active=false - -[org/gnome/settings-daemon/plugins/xrandr] -active=true - -[org/gnome/settings-daemon/plugins/xsettings] -active=true diff --git a/data/00-upstream-settings-locks b/data/00-upstream-settings-locks index 4a686d7e..24da90f6 100644 --- a/data/00-upstream-settings-locks +++ b/data/00-upstream-settings-locks @@ -12,17 +12,7 @@ /org/gnome/desktop/lockdown/disable-user-switching /org/gnome/desktop/session/session-name /org/gnome/desktop/sound/event-sounds -/org/gnome/settings-daemon/plugins/a11y-keyboard/active -/org/gnome/settings-daemon/plugins/a11y-settings/active -/org/gnome/settings-daemon/plugins/background/active -/org/gnome/settings-daemon/plugins/clipboard/active -/org/gnome/settings-daemon/plugins/color/active -/org/gnome/settings-daemon/plugins/cursor/active -/org/gnome/settings-daemon/plugins/font/active -/org/gnome/settings-daemon/plugins/gconf/active -/org/gnome/settings-daemon/plugins/housekeeping/active -/org/gnome/settings-daemon/plugins/keybindings/active -/org/gnome/settings-daemon/plugins/media-keys/active +/org/gnome/settings-daemon/plugins/whitelisted-plugins /org/gnome/settings-daemon/plugins/media-keys/calculator /org/gnome/settings-daemon/plugins/media-keys/eject /org/gnome/settings-daemon/plugins/media-keys/email @@ -37,13 +27,3 @@ /org/gnome/settings-daemon/plugins/media-keys/search /org/gnome/settings-daemon/plugins/media-keys/stop /org/gnome/settings-daemon/plugins/media-keys/www -/org/gnome/settings-daemon/plugins/mouse/active -/org/gnome/settings-daemon/plugins/orientation/active -/org/gnome/settings-daemon/plugins/power/active -/org/gnome/settings-daemon/plugins/print-notifications/active -/org/gnome/settings-daemon/plugins/smartcard/active -/org/gnome/settings-daemon/plugins/sound/active -/org/gnome/settings-daemon/plugins/updates/active -/org/gnome/settings-daemon/plugins/wacom/active -/org/gnome/settings-daemon/plugins/xrandr/active -/org/gnome/settings-daemon/plugins/xsettings/active |