diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-11-19 20:01:34 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-11-19 20:01:34 +0000 |
commit | fd1a81c66f05b72199b1d1e628c3ce282e55560b (patch) | |
tree | b7ae74ba85b75a5c84235ee28ce3b3813f645e04 | |
parent | 1812d0ac69cf8b0ec909fd84072af8e563aa9e43 (diff) | |
download | gdm-fd1a81c66f05b72199b1d1e628c3ce282e55560b.tar.gz |
Setup gconf database for the GDM greeter session.
2007-11-19 William Jon McCann <mccann@jhu.edu>
* configure.ac:
* data/Makefile.am:
* data/gconf.path:
* data/session-setup.entries:
Setup gconf database for the GDM greeter session.
Patch from: Ray Strode <rstrode@redhat.com>
and Matthias Clasen <mclasen@redhat.com>
svn path=/trunk/; revision=5513
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | configure.ac | 14 | ||||
-rw-r--r-- | data/Makefile.am | 7 | ||||
-rw-r--r-- | data/gconf.path | 5 | ||||
-rw-r--r-- | data/session-setup.entries | 124 |
5 files changed, 160 insertions, 1 deletions
@@ -1,3 +1,14 @@ +2007-11-19 William Jon McCann <mccann@jhu.edu> + + * configure.ac: + * data/Makefile.am: + * data/gconf.path: + * data/session-setup.entries: + Setup gconf database for the GDM greeter session. + + Patch from: Ray Strode <rstrode@redhat.com> + and Matthias Clasen <mclasen@redhat.com> + 2007-11-14 Ray Strode <rstrode@redhat.com> * daemon/gdm-display.c (gdm_display_real_unmanage): diff --git a/configure.ac b/configure.ac index 83f69156..5ccd800d 100644 --- a/configure.ac +++ b/configure.ac @@ -1166,6 +1166,20 @@ AC_SUBST(GDM_PID_FILE) AC_DEFINE_UNQUOTED(GDM_PID_FILE, "$GDM_PID_FILE", [pid file]) dnl --------------------------------------------------------------------------- +dnl - GREETER WORKING DIRECTORY +dnl --------------------------------------------------------------------------- + +AC_ARG_WITH(working-directory, [ --with-working-dir=<dir> working directory]) + +if ! test -z "$with_working_directory"; then + GDM_WORKING_DIR=$with_working_directory +else + GDM_WORKING_DIR=${localstatedir}/lib/gdm +fi + +AC_SUBST(GDM_WORKING_DIR) + +dnl --------------------------------------------------------------------------- dnl - Allow configure to specify RBAC keys. dnl --------------------------------------------------------------------------- diff --git a/data/Makefile.am b/data/Makefile.am index b47c2c98..ad37278f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,6 +10,7 @@ authdir = $(localstatedir)/gdm postdir = $(gdmconfdir)/PostSession predir = $(gdmconfdir)/PreSession postlogindir = $(gdmconfdir)/PostLogin +workingdir = $(GDM_WORKING_DIR) Xsession: $(srcdir)/Xsession.in sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \ @@ -108,7 +109,7 @@ uninstall-hook: $(DESTDIR)$(predir)/Default \ $(DESTDIR)$(postdir)/Default -install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession +install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path if test '!' -d $(DESTDIR)$(gdmconfdir); then \ $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ chmod 755 $(DESTDIR)$(gdmconfdir); \ @@ -181,4 +182,8 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession echo "Please add PAM authentication for gdm and gdm-autologin in $(PAM_PREFIX)/pam.conf!"; \ fi; \ fi + install -m644 -D gconf.path $(DESTDIR)$(workingdir)/.gconf.path + gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load session-setup.entries + + diff --git a/data/gconf.path b/data/gconf.path new file mode 100644 index 00000000..52e7ed86 --- /dev/null +++ b/data/gconf.path @@ -0,0 +1,5 @@ +# treat system-wide settings as mandatory +xml:readonly:/etc/gconf/gconf.xml.system + +# override some settings +xml:readonly:$(HOME)/.gconf.mandatory diff --git a/data/session-setup.entries b/data/session-setup.entries new file mode 100644 index 00000000..4fdfb342 --- /dev/null +++ b/data/session-setup.entries @@ -0,0 +1,124 @@ +<gconfentryfile> + <entrylist base="/"> + <entry> + <key>/apps/gnome-screensaver/power_management_delay</key> + <value> + <int>30</int> + </value> + </entry> + <entry> + <key>/apps/metacity/general/num_workspaces</key> + <value> + <int>1</int> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/cycle_panels</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/cycle_panels_backward</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/panel_main_menu</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/panel_run_dialog</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/run_command_screenshot</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/run_command_window_screenshot</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/show_desktop</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/switch_group</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/switch_panels</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/switch_to_workspace_down</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/switch_to_workspace_left</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/switch_to_workspace_right</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/global_keybindings/switch_to_workspace_up</key> + <value> + <string>disabled</string> + </value> + </entry> + <entry> + <key>/apps/metacity/keybinding_commands/command_screenshot</key> + <value> + <string>/bin/true</string> + </value> + </entry> + <entry> + <key>/apps/metacity/keybinding_commands/command_window_screenshot</key> + <value> + <string>/bin/true</string> + </value> + </entry> + <entry> + <key>/desktop/gnome/url-handlers/http/command</key> + <value> + <string>/bin/true</string> + </value> + </entry> + <entry> + <key>/desktop/gnome/url-handlers/https/command</key> + <value> + <string>/bin/true</string> + </value> + </entry> + <entry> + <key>/desktop/gnome/url-handlers/mailto/command</key> + <value> + <string>/bin/true</string> + </value> + </entry> + </entrylist> +</gconfentryfile> |