[Demudi-commits] r426 - in demudi-base-files/trunk: debian etc/X11/Xsession.d etc/X11/fluxbox etc/skel/.fluxbox

[Free Ekanayaka]

Author: free-guest
Date: 2005-03-09 00:10:27 +0100 (Wed, 09 Mar 2005)
New Revision: 426

Added:
   demudi-base-files/trunk/etc/X11/fluxbox/slitlist
Removed:
   demudi-base-files/trunk/etc/skel/.fluxbox/slitlist
Modified:
   demudi-base-files/trunk/debian/changelog
   demudi-base-files/trunk/etc/X11/Xsession.d/51demudi
   demudi-base-files/trunk/etc/skel/.fluxbox/init
Log:
demudi-base-files:   
 * Using information from /proc to decide whether to start wmbattery and wmwave

Modified: demudi-base-files/trunk/debian/changelog
===================================================================
--- demudi-base-files/trunk/debian/changelog	2005-03-08 21:45:21 UTC (rev 425)
+++ demudi-base-files/trunk/debian/changelog	2005-03-08 23:10:27 UTC (rev 426)
@@ -4,6 +4,7 @@
   * Added snd-intel8x0m, snd-atiixp-modem to the hotplug blacklist
   * Added init file for fbpager
   * Added default slitlist for Fluxbox along with new dockapps
+  * Using information from /proc to decide whether to start wmbattery and wmwave
 
  -- Free Ekanayaka <free@agnula.org>  Mon,  7 Mar 2005 11:56:48 +0100
 

Modified: demudi-base-files/trunk/etc/X11/Xsession.d/51demudi
===================================================================
--- demudi-base-files/trunk/etc/X11/Xsession.d/51demudi	2005-03-08 21:45:21 UTC (rev 425)
+++ demudi-base-files/trunk/etc/X11/Xsession.d/51demudi	2005-03-08 23:10:27 UTC (rev 426)
@@ -9,16 +9,22 @@
 # Mute the bell
 xset -b
 
+# Defaults
+rsync -r --ignore-existing /etc/skel/ $HOME/
+
 # Exec programs
 if [ "$GDMSESSION" == "fluxbox" ]; then
 
 	exec wmcalclock &
 	exec wmbio &
 	exec wmtop &
-	exec wmacpi &
 	exec wmweather -m -s LIPE &
-	exec wmbattery &
-	exec wmwave &
+	if [ -d /proc/acpi/battery ] && [ $(ls /proc/acpi/battery | wc -l) -gt 0  ]; then
+	    exec wmbattery &
+	fi
+	if [ -f /proc/net/wireless ] && [ $(cat /proc/net/wireless | wc -l) -gt 2  ]; then
+	    exec wmwave &
+	fi
 	exec wmmixer -w &
 	exec wmusic &
 	exec gkrellm -w &

Copied: demudi-base-files/trunk/etc/X11/fluxbox/slitlist (from rev 425, demudi-base-files/trunk/etc/skel/.fluxbox/slitlist)

Modified: demudi-base-files/trunk/etc/skel/.fluxbox/init
===================================================================
--- demudi-base-files/trunk/etc/skel/.fluxbox/init	2005-03-08 21:45:21 UTC (rev 425)
+++ demudi-base-files/trunk/etc/skel/.fluxbox/init	2005-03-08 23:10:27 UTC (rev 426)
@@ -13,6 +13,7 @@
 session.screen0.slit.layer:	Dock
 session.screen0.toolbar.placement:	BottomCenter
 session.screen0.toolbar.tools:	workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
+session.screen0.toolbar.alpha:	196
 session.screen0.toolbar.widthPercent:	64
 session.screen0.toolbar.onhead:	0
 session.screen0.toolbar.layer:	Desktop
@@ -37,7 +38,7 @@
 session.screen0.focusModel:	SloppyFocus
 session.screen0.desktopwheeling:	true
 session.screen0.showwindowposition:	true
-session.screen0.menuAlpha:	255
+session.screen0.menu.alpha:	195
 session.screen0.decorateTransient:	false
 session.screen0.workspaceNames:	Term,Web,Edit,
 session.screen0.focusLastWindow:	true
@@ -57,7 +58,7 @@
 session.tabs:	true
 session.cacheMax:	200l
 session.colorsPerChannel:	4
-session.slitlistFile:	
+session.slitlistFile:	/etc/X11/fluxbox/slitlist
 session.autoRaiseDelay:	250
 session.ignoreBorder:	false
 session.useMod1:	true

Deleted: demudi-base-files/trunk/etc/skel/.fluxbox/slitlist
===================================================================
--- demudi-base-files/trunk/etc/skel/.fluxbox/slitlist	2005-03-08 21:45:21 UTC (rev 425)
+++ demudi-base-files/trunk/etc/skel/.fluxbox/slitlist	2005-03-08 23:10:27 UTC (rev 426)
@@ -1,14 +0,0 @@
-wmcalclock
-wmbio
-wmtop
-wmacpi
-wmweather
-wmwave
-wmbattery
-wmmixer -w
-wmusic
-wmmixer
-gkrellm
-fbpager
-wmix
-docker