From 0e2a8b9a433874b98432d56883d5f54452dc5946 Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Thu, 21 Sep 2006 09:41:18 +0000
Subject: fix for the fbsetbg-fix from yesterday

---
 util/fbsetbg | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/util/fbsetbg b/util/fbsetbg
index bd8c369..60118e5 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -46,7 +46,7 @@
 # _NET_CURRENT_DESKTOP
 
 # The wallpapersetter is selected in this order
-wpsetters="${wpsetters:=fbsetroot Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg'
+wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg'
 lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
 
 
@@ -194,6 +194,16 @@ debugfbsetbg() {
     exit 0
 }
 
+use_fbsetroot() {
+
+    fbsetroot $wallpaper
+    if [ ! "$remember" = false ]; then
+        remembercommand
+    fi
+    exit 0
+}
+
+
 if [ $# -eq 0 ]; then
     message "no options given"
     display_usage
@@ -263,11 +273,13 @@ while [ $# -gt 0 ]; do
         -b) option=fbsetroot
             shift
             wallpaper=$*
+            use_fbsetroot
             break ;;
         -B) option=fbsetroot
             shift
             wallpaper=$*
             remember=false
+            use_fbsetroot
             break ;;
         -r) option2=$option
             option=random
@@ -357,9 +369,6 @@ standardok=\
 "$WPSETTER is a nice wallpapersetter. You won't have any problems."
 
 case $WPSETTER in
-    fbsetroot) 
-        debugstory="fbsetroot does not show any pictures."
-        ;;
     chbg)
         full='-once -mode maximize'
         tile='-once -mode tile'
@@ -470,15 +479,6 @@ if [ -z "$DISPLAY" ]; then
 fi
 
 
-if [ "$option" = fbsetroot ]; then
-    fbsetroot $wallpaper
-    if [ ! "$remember" = false ]; then
-        remembercommand
-    fi
-    exit 0
-fi
-
-
 # random wallpaper code
 if [ "$option" = random ]; then
     # Lets make one thing clear...
-- 
cgit v0.11.2