summaryrefslogtreecommitdiff
path: root/data/dconf
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2014-01-14 09:52:55 -0500
committerRyan Lortie <desrt@desrt.ca>2014-01-31 00:53:27 +0000
commitfeb6ddaff33a3e58a20e94264313322534963f98 (patch)
tree6e728697a3ffe4d4b03df114ebd48d68a0670d57 /data/dconf
parent6bec701a5e12a7367ba5d212c2748b0f3ed79978 (diff)
downloadgdm-feb6ddaff33a3e58a20e94264313322534963f98.tar.gz
move over to using 'dconf compile' and file-db
Instead of installing keyfiles in /etc and running 'dconf update' to generate the database in place (or requiring package system triggers to do so for us), just build the database in-tree using the new 'dconf compile' command. We can install that in our pkgdatadir. dconf now also looks in XDG_DATA_DIRS in addition to /etc when finding profiles, so install ours there too. This makes gdm /etc-clean with respect to dconf. If users want to make additional customisations to the gdm login session then they should create their own dconf database in /etc/dconf and then replace the 'gdm' profile with one that references their new db (by way of /etc/dconf/profile/gdm, which is searched first). https://bugzilla.gnome.org/show_bug.cgi?id=722241
Diffstat (limited to 'data/dconf')
-rw-r--r--data/dconf/.gitignore1
-rw-r--r--data/dconf/defaults/00-upstream-settings57
-rw-r--r--data/dconf/defaults/locks/00-upstream-settings-locks30
-rw-r--r--data/dconf/gdm.in2
4 files changed, 90 insertions, 0 deletions
diff --git a/data/dconf/.gitignore b/data/dconf/.gitignore
new file mode 100644
index 00000000..f0047b3f
--- /dev/null
+++ b/data/dconf/.gitignore
@@ -0,0 +1 @@
+/gdm
diff --git a/data/dconf/defaults/00-upstream-settings b/data/dconf/defaults/00-upstream-settings
new file mode 100644
index 00000000..24a7715e
--- /dev/null
+++ b/data/dconf/defaults/00-upstream-settings
@@ -0,0 +1,57 @@
+# 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]
+whitelisted-plugins=['a11y-keyboard', 'a11y-settings', 'background', 'clipboard', 'color', 'cursor', 'keyboard', 'media-keys', 'orientation', 'power', 'smartcard', 'sound', 'xrandr', 'xsettings']
+
+[org/gnome/settings-daemon/plugins/media-keys]
+calculator=''
+eject=''
+email=''
+help=''
+home=''
+media=''
+next=''
+pause=''
+play=''
+previous=''
+screensaver=''
+search=''
+stop=''
+www=''
+
+[org/gnome/settings-daemon/peripherals/input-devices]
+hotplug-command=''
diff --git a/data/dconf/defaults/locks/00-upstream-settings-locks b/data/dconf/defaults/locks/00-upstream-settings-locks
new file mode 100644
index 00000000..830a729c
--- /dev/null
+++ b/data/dconf/defaults/locks/00-upstream-settings-locks
@@ -0,0 +1,30 @@
+/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/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
+/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/peripherals/input-devices/hotplug-command
diff --git a/data/dconf/gdm.in b/data/dconf/gdm.in
new file mode 100644
index 00000000..4d8bf174
--- /dev/null
+++ b/data/dconf/gdm.in
@@ -0,0 +1,2 @@
+user-db:user
+file-db:@DATADIR@/@PACKAGE@/greeter-dconf-defaults