From: | "Samuli Suominen (ssuominen)" <ssuominen@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in xfce-base/xfce-utils/files: xfce-utils-4.7.0-ck-launch-session-2.patch |
Date: | Fri, 10 Sep 2010 07:27:55 |
Message-Id: | 20100910072751.DDAC820054@flycatcher.gentoo.org |
1 | ssuominen 10/09/10 07:27:51 |
2 | |
3 | Added: xfce-utils-4.7.0-ck-launch-session-2.patch |
4 | Log: |
5 | Run ck-launch-session again to restore functionality with Thunar disk handling wrt upstream #6690. |
6 | |
7 | (Portage version: 2.2_rc78/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-base/xfce-utils/files/xfce-utils-4.7.0-ck-launch-session-2.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: xfce-utils-4.7.0-ck-launch-session-2.patch |
16 | =================================================================== |
17 | From ad0a04125051a4638a31e6e0c2d1dc711676e1ef Mon Sep 17 00:00:00 2001 |
18 | From: Mike Massonnet <mmassonnet@××××.org> |
19 | Date: Wed, 8 Sep 2010 22:01:50 +0200 |
20 | Subject: [PATCH] Launch xfce4-session with ck-launch-session and dbus-launch. |
21 | |
22 | Makes shutdown/reboot and mount/unmount work for gvfs when login through |
23 | a tty. |
24 | --- |
25 | scripts/xinitrc.in.in | 6 +++++- |
26 | 1 files changed, 5 insertions(+), 1 deletions(-) |
27 | |
28 | diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in |
29 | index 2bd43ec..241d00f 100755 |
30 | --- a/scripts/xinitrc.in.in |
31 | +++ b/scripts/xinitrc.in.in |
32 | @@ -196,7 +196,11 @@ fi |
33 | |
34 | # Run xfce4-session if installed |
35 | if which xfce4-session >/dev/null 2>&1; then |
36 | - xfce4-session |
37 | + if test -z "$XDG_SESSION_COOKIE" -a x"`which ck-launch-session 2>/dev/null`" != x""; then |
38 | + ck-launch-session dbus-launch --sh-syntax --exit-with-session xfce4-session |
39 | + else |
40 | + xfce4-session |
41 | + fi |
42 | |
43 | if test "$ssh_agent_kill_cmd"; then |
44 | echo "running '$ssh_agent_kill_cmd'" |
45 | -- |
46 | 1.7.2.3 |