Commit fd1a81c6 authored by William Jon McCann's avatar William Jon McCann Committed by William Jon McCann

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
parent 1812d0ac
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):
......
......@@ -1165,6 +1165,20 @@ fi
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 ---------------------------------------------------------------------------
......
......@@ -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
# treat system-wide settings as mandatory
xml:readonly:/etc/gconf/gconf.xml.system
# override some settings
xml:readonly:$(HOME)/.gconf.mandatory
<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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment