Magellan Linux

Contents of /trunk/fluxbox/patches/fluxbox-1.3.2-consolekit-2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1594 - (show annotations) (download)
Fri Dec 2 13:56:51 2011 UTC (12 years, 4 months ago) by niro
File size: 892 byte(s)
-fixed the patch
1 diff -Naur fluxbox-1.3.2/util/startfluxbox.in fluxbox-1.3.2-magellan/util/startfluxbox.in
2 --- fluxbox-1.3.2/util/startfluxbox.in 2011-10-29 15:46:15.000000000 +0200
3 +++ fluxbox-1.3.2-magellan/util/startfluxbox.in 2011-11-30 12:52:03.205982797 +0100
4 @@ -23,10 +23,16 @@
5 shift
6 done
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 [ -x "$startup" ]; then
15 - exec "$startup"
16 + exec $CK_LAUNCH_SESSION "$startup"
17 elif [ -r "$startup" ]; then
18 - exec sh "$startup"
19 + exec $CK_LAUNCH_SESSION sh "$startup"
20 else
21 if [ ! -d $fluxdir ]; then
22 mkdir -p "$fluxdir/backgrounds" "$fluxdir/styles" "$fluxdir/pixmaps"
23 @@ -60,5 +66,5 @@
24 ) > "$startup"
25 fi
26 chmod 644 "$startup"
27 - exec sh "$startup"
28 + exec $CK_LAUNCH_SESSION sh "$startup"
29 fi