[gdm/gnome-3-2] data: drop weird dconf script

[Ray Strode <halfline src gnome org>]

commit eebeb62e2daccc932f3033fbd857b619ba9936d0
Author: Ray Strode <rstrode redhat com>
Date:   Wed Oct 19 11:23:58 2011 -0400

    data: drop weird dconf script
    
    It adds a lot of packaging pain and confusion for distributors,
    and the bulk of the gain from it could be fixed by adding a
    setting to gnome-settings-daemon.
    
    Instead, just ship a static list of settings.
    
    Distros will still need to run dconf update in their post transaction
    hooks, however.

 data/00-upstream-settings       |  115 +++++++++++++++++++++++++++
 data/00-upstream-settings-locks |   50 ++++++++++++
 data/Makefile.am                |   19 +----
 data/gdm-update-dconf-db        |  167 ---------------------------------------
 data/upstream-settings          |   40 ---------
 5 files changed, 167 insertions(+), 224 deletions(-)
---
diff --git a/data/00-upstream-settings b/data/00-upstream-settings
new file mode 100644
index 0000000..1511b7b
--- /dev/null
+++ b/data/00-upstream-settings
@@ -0,0 +1,115 @@
+# This file is part of the GDM packaging and should not be changed.
+#
+# Instead create your own file next to it with a higher numbered prefix,
+# and run
+#
+#       dconf update
+#
+
+[org/gnome/desktop/a11y/keyboard]
+enable=true
+
+[org/gnome/desktop/background]
+show-desktop-icons=false
+
+[org/gnome/desktop/default-applications/terminal]
+exec='/bin/true'
+
+[org/gnome/desktop/interface]
+toolkit-accessibility=true
+
+[org/gnome/desktop/lockdown]
+disable-application-handlers=true
+disable-command-line=true
+disable-lock-screen=true
+disable-log-out=false
+disable-printing=true
+disable-print-setup=true
+disable-save-to-disk=true
+disable-user-switching=true
+
+[org/gnome/desktop/session]
+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/keyboard]
+active=false
+
+[org/gnome/settings-daemon/plugins/media-keys]
+active=true
+calculator=''
+eject=''
+email=''
+help=''
+home=''
+media=''
+next=''
+pause=''
+play=''
+previous=''
+screensaver=''
+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
new file mode 100644
index 0000000..13a14b1
--- /dev/null
+++ b/data/00-upstream-settings-locks
@@ -0,0 +1,50 @@
+/org/gnome/desktop/a11y/keyboard/enable
+/org/gnome/desktop/background/show-desktop-icons
+/org/gnome/desktop/default-applications/terminal/exec
+/org/gnome/desktop/interface/toolkit-accessibility
+/org/gnome/desktop/lockdown/disable-application-handlers
+/org/gnome/desktop/lockdown/disable-command-line
+/org/gnome/desktop/lockdown/disable-lock-screen
+/org/gnome/desktop/lockdown/disable-log-out
+/org/gnome/desktop/lockdown/disable-printing
+/org/gnome/desktop/lockdown/disable-print-setup
+/org/gnome/desktop/lockdown/disable-save-to-disk
+/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/keyboard/active
+/org/gnome/settings-daemon/plugins/media-keys/active
+/org/gnome/settings-daemon/plugins/media-keys/calculator
+/org/gnome/settings-daemon/plugins/media-keys/eject
+/org/gnome/settings-daemon/plugins/media-keys/email
+/org/gnome/settings-daemon/plugins/media-keys/help
+/org/gnome/settings-daemon/plugins/media-keys/home
+/org/gnome/settings-daemon/plugins/media-keys/media
+/org/gnome/settings-daemon/plugins/media-keys/next
+/org/gnome/settings-daemon/plugins/media-keys/pause
+/org/gnome/settings-daemon/plugins/media-keys/play
+/org/gnome/settings-daemon/plugins/media-keys/previous
+/org/gnome/settings-daemon/plugins/media-keys/screensaver
+/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
diff --git a/data/Makefile.am b/data/Makefile.am
index 34f7b3e..a209fb3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -88,12 +88,6 @@ localealias_DATA = locale.alias
 sessiondir = $(datadir)/gnome-session/sessions
 session_DATA = gdm-fallback.session gdm-shell.session
 
-settingsdir = $(datadir)/gdm
-settings_DATA = $(srcdir)/upstream-settings
-
-dconfthingdir = $(libexecdir)
-dconfthing_SCRIPTS = $(srcdir)/gdm-update-dconf-db
-
 gdm-fingerprint: gdm-fingerprint.pam
 	cp $(srcdir)/gdm-fingerprint.pam $(builddir)/gdm-fingerprint
 
@@ -124,9 +118,9 @@ EXTRA_DIST =			\
 	gconf.path		\
 	session-setup.entries	\
 	gdm-shell.session.in    \
-	gdm-update-dconf-db \
 	dconf-profile \
-	upstream-settings \
+	00-upstream-settings \
+	00-upstream-settings-locks \
 	org.gnome.login-screen.gschema.xml.in \
 	$(NULL)
 
@@ -153,15 +147,6 @@ MAINTAINERCLEANFILES =			\
 	gdm-smartcard			\
 	Makefile.in
 
-00-upstream-settings: $(srcdir)/gdm-update-dconf-db
-	$(srcdir)/gdm-update-dconf-db $(srcdir)/upstream-settings 00-upstream-settings
-
-00-upstream-settings-locks: 00-upstream-settings
-
-dist-hook: 00-upstream-settings 00-upstream-settings-locks
-	cp $(srcdir)/00-upstream-settings $(distdir)
-	cp $(srcdir)/00-upstream-settings-locks $(distdir)
-
 uninstall-hook:
 	rm -f \
 	$(DESTDIR)$(GDM_CUSTOM_CONF) \