From 05cd44de24c0b81b88e41f3fa9e78159f701e033 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Mon, 27 Jan 2014 16:07:42 -0500
Subject: Revert "data: removing 'workingdir' dconf manipulations"

This reverts commit d74c93a2d2c3e88ec8fc0765edac8722bd57408d.
---
 data/Makefile.am | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 313eb9f9..c61ca589 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,6 +11,7 @@ initdir = $(gdmconfdir)/Init
 postdir = $(gdmconfdir)/PostSession
 predir = $(gdmconfdir)/PreSession
 postlogindir = $(gdmconfdir)/PostLogin
+workingdir = $(GDM_WORKING_DIR)
 xauthdir = $(GDM_XAUTH_DIR)
 screenshotdir = $(GDM_SCREENSHOT_DIR)
 cachedir = $(localstatedir)/cache/gdm
@@ -214,6 +215,7 @@ uninstall-hook:
 	$(DESTDIR)$(sysconfdir)/dconf/db/gdm \
 	$(DESTDIR)$(sysconfdir)/dconf/profile/gdm \
 	-rf \
+	$(DESTDIR)$(workingdir)/.config/dconf \
 	$(DESTDIR)$(screenshotdir) \
 	$(DESTDIR)$(xauthdir) \
 	$(DESTDIR)$(PAM_PREFIX)/pam.d
@@ -311,6 +313,24 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(system
 		chown gdm:gdm $(DESTDIR)$(screenshotdir) || : ; \
 	fi
 
+	if test '!' -d $(DESTDIR)$(workingdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(workingdir); \
+		chmod 1770 $(DESTDIR)$(workingdir); \
+		chown root:gdm $(DESTDIR)$(workingdir) || : ; \
+	fi
+
+	if test '!' -d $(DESTDIR)$(workingdir)/.config/dconf; then \
+		$(mkinstalldirs) $(DESTDIR)$(workingdir)/.config/dconf; \
+		chmod 0755 $(DESTDIR)$(workingdir)/.config/dconf; \
+		chown gdm:gdm $(DESTDIR)$(workingdir)/.config/dconf || : ; \
+	fi
+
+	if test '!' -d $(DESTDIR)$(workingdir)/.local/share/applications; then \
+		$(mkinstalldirs) $(DESTDIR)$(workingdir)/.local/share/applications; \
+		chmod 0755 $(DESTDIR)$(workingdir)/.local/share/applications; \
+		chown gdm:gdm $(DESTDIR)$(workingdir)/.local/share/applications || : ; \
+	fi
+
 	if test '!' -d $(DESTDIR)$(cachedir); then \
 		$(mkinstalldirs) $(DESTDIR)$(cachedir); \
 		chmod 1755 $(DESTDIR)$(cachedir); \
-- 
cgit v1.2.1