# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1210551394 -7200
# Node ID a1d12c37584a596cc0320844e2768ba10312eb07
# Parent  a98ae02c202272f9f7ab1ea6712c1540141a4359
Up: sliaz-tools (2.3), slitaz-configs (2.1) and use desktopbox to logout from lxpanel

diff -r a98ae02c2022 -r a1d12c37584a lxpanel/receipt
--- a/lxpanel/receipt	Mon May 12 01:50:36 2008 +0200
+++ b/lxpanel/receipt	Mon May 12 02:16:34 2008 +0200
@@ -73,13 +73,9 @@
 #!/bin/sh
 # lxsession-logout fake.
 #
-WM=`cat /etc/X11/wm.default`
 
-if [ "$WM" = "jwm" ]; then
-	jwm -exit
-else
-	openbox --exit
-fi
+desktopbox logout &
+exit 0
 
 EOT
 	chmod +x $root/usr/bin/lxsession-logout
diff -r a98ae02c2022 -r a1d12c37584a lxpanel/stuff/default/config
--- a/lxpanel/stuff/default/config	Mon May 12 01:50:36 2008 +0200
+++ b/lxpanel/stuff/default/config	Mon May 12 02:16:34 2008 +0200
@@ -1,4 +1,4 @@
 [Command]
 FileManager=pcmanfm %s
 Terminal=xterm -e
-Logout=openbox --exit
+Logout=desktopbox logout
diff -r a98ae02c2022 -r a1d12c37584a lxpanel/stuff/default/panels/panel
--- a/lxpanel/stuff/default/panels/panel	Mon May 12 01:50:36 2008 +0200
+++ b/lxpanel/stuff/default/panels/panel	Mon May 12 02:16:34 2008 +0200
@@ -158,6 +158,9 @@
         Button {
             id=hardinfo.desktop
         }
+        Button {
+            id=tazpkgbox.desktop
+        }
     }
 }
 
@@ -166,7 +169,7 @@
     Config {
         ClockFmt=%R
         TooltipFmt=%A %x
-        Action=osmo
+        Action=./home/hacker/Projects/boxes/clockbox
         BoldFont=0
     }
 }
diff -r a98ae02c2022 -r a1d12c37584a slitaz-configs/receipt
--- a/slitaz-configs/receipt	Mon May 12 01:50:36 2008 +0200
+++ b/slitaz-configs/receipt	Mon May 12 02:16:34 2008 +0200
@@ -1,13 +1,11 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-configs"
-VERSION="2.0"
+VERSION="2.1"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files, wallpaper and login sound."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="slitaz-tools xorg-libXcomposite xorg-libXdamage xorg-xcompmgr 
-             transset-df tazlito tazpkg slitaz-doc lxtask lxpanel lxappearance
-             openbox ttf-dejavu"
+DEPENDS="slitaz-tools xorg-libXcomposite xorg-libXdamage xorg-xcompmgr transset-df tazlito tazpkg slitaz-doc lxtask lxpanel lxappearance openbox ttf-dejavu"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.slitaz.org/"
 WGET_URL="http://download.tuxfamily.org/slitaz/sources/base-files/$TARBALL"
diff -r a98ae02c2022 -r a1d12c37584a slitaz-tools/receipt
--- a/slitaz-tools/receipt	Mon May 12 01:50:36 2008 +0200
+++ b/slitaz-tools/receipt	Mon May 12 02:16:34 2008 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-tools"
-VERSION="2.2"
+VERSION="2.3"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz tools provide installer and Tinyutils."
 MAINTAINER="pankso@slitaz.org"