Annotation of /trunk/xfce-utils/patches/xfce-utils-4.8.3-consolekit.patch
Parent Directory | Revision Log
Revision 1589 -
(hide annotations)
(download)
Tue Nov 29 22:58:44 2011 UTC (12 years, 9 months ago) by niro
File size: 735 byte(s)
Tue Nov 29 22:58:44 2011 UTC (12 years, 9 months ago) by niro
File size: 735 byte(s)
-add consolekit support patch
1 | niro | 1589 | diff -Naur xfce-utils-4.8.3/scripts/startxfce4.in xfce-utils-4.8.3-magellan/scripts/startxfce4.in |
2 | --- xfce-utils-4.8.3/scripts/startxfce4.in 2011-09-22 21:38:05.000000000 +0200 | ||
3 | +++ xfce-utils-4.8.3-magellan/scripts/startxfce4.in 2011-11-30 00:41:57.288979670 +0100 | ||
4 | @@ -50,13 +50,19 @@ | ||
5 | fi | ||
6 | export XDG_CONFIG_DIRS | ||
7 | |||
8 | +CK_LAUNCH_SESSION="" | ||
9 | +if test "x$XDG_SESSION_COOKIE" = "x" && [ -x /usr/bin/ck-launch-session ] | ||
10 | +then | ||
11 | + CK_LAUNCH_SESSION="/usr/bin/ck-launch-session" | ||
12 | +fi | ||
13 | + | ||
14 | if test "x$DISPLAY" = "x" | ||
15 | then | ||
16 | echo "$0: Starting X server" | ||
17 | - prog=xinit | ||
18 | + prog="$CK_LAUNCH_SESSION xinit" | ||
19 | else | ||
20 | echo "$0: X server already running on display $DISPLAY" | ||
21 | - prog=/bin/sh | ||
22 | + prog="$CK_LAUNCH_SESSION /bin/sh" | ||
23 | fi | ||
24 | |||
25 | if test ! "x$*" = "x" |