Only run xdg-user-dirs-update under Gnome to prevent conflicts with XFCE, bug #382685 by Samuli Suominen.

(Portage version: 2.1.10.14/cvs/Linux x86_64)

4 files changed, 20 insertions, 11 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index b052b0b5b640..44fc636c1102 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.296 2011/09/12 10:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.297 2011/09/12 10:35:55 pacho Exp $
+
+  12 Sep 2011; Pacho Ramos <pacho@gentoo.org> +files/10-user-dirs-update-gnome,
+  -files/10-user-dirs-update, gnome-session-2.32.1-r3.ebuild,
+  gnome-session-3.0.2.ebuild:
+  Only run xdg-user-dirs-update under Gnome to prevent conflicts with XFCE, bug
+  #382685 by Samuli Suominen.
 
 *gnome-session-2.32.1-r3 (12 Sep 2011)
 
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update b/gnome-base/gnome-session/files/10-user-dirs-update-gnome
index 317f095e0bcc..f909d44dacdf 100644..100755
--- a/gnome-base/gnome-session/files/10-user-dirs-update
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome
@@ -2,6 +2,9 @@
 
 # Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
 # That file is read by glib to get XDG_PICTURES_DIR, etc
-if type xdg-user-dirs-update &>/dev/null; then
-	xdg-user-dirs-update
+
+if [ "$DESKTOP_SESSION" = "gnome" ]; then
+	if type xdg-user-dirs-update &>/dev/null; then
+		xdg-user-dirs-update
+	fi
 fi
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
index 2e9424e5a04e..a10d7fe80e41 100644
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.1 2011/09/12 10:01:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.2 2011/09/12 10:35:55 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -19,7 +19,7 @@ IUSE="doc ipv6 elibc_FreeBSD"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update below).
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=x11-libs/gtk+-2.22.0:2
 	>=dev-libs/dbus-glib-0.76
@@ -98,6 +98,6 @@ src_install() {
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/15-xdg-data-gnome"
 
-	# FIXME: this should be done by x11-misc/xdg-user-dirs
-	doexe "${FILESDIR}/10-user-dirs-update"
+	# This should be done here as discussed in bug #270852
+	doexe "${FILESDIR}/10-user-dirs-update-gnome"
 }
diff --git a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
index a797ed9679fd..0c25e356fbc4 100644
--- a/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.0.2.ebuild,v 1.3 2011/08/19 12:07:06 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.0.2.ebuild,v 1.4 2011/09/12 10:35:55 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -17,7 +17,7 @@ IUSE="doc ipv6 elibc_FreeBSD"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update below).
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
 	>=x11-libs/gtk+-2.90.7:3
 	>=dev-libs/dbus-glib-0.76
@@ -86,8 +86,8 @@ src_install() {
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/15-xdg-data-gnome" || die
 
-	# FIXME: this should be done by x11-misc/xdg-user-dirs
-	doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed"
+	# This should be done here as discussed in bug #270852
+	doexe "${FILESDIR}/10-user-dirs-update-gnome"
 }
 
 pkg_postinst() {