util updates from han

4 files changed, 11 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index e54c639..b653846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.7:
+*03/11/23:
+  * Some util/ updates from Han
+    .cvsignore fbsetbg fluxbox_generate_menu.in
 *03/11/19:
   * Fix menu draw bug for empty submenus (Simon)
     Menu.cc
diff --git a/util/.cvsignore b/util/.cvsignore
index 11cb841..99b004c 100644
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -4,3 +4,4 @@ Makefile
 Makefile.in
 bsetroot
 startfluxbox
+fluxbox-generate_menu
diff --git a/util/fbsetbg b/util/fbsetbg
index b747e30..b31cb6f 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -23,7 +23,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# $Id: fbsetbg,v 1.22 2003/10/16 15:54:20 rathnor Exp $
+# $Id: fbsetbg,v 1.23 2003/11/23 01:19:01 rathnor Exp $
 
 # Portability notes:
 # To guarantee this script works on all platforms that support fluxbox
@@ -279,7 +279,7 @@ done
 standardrant=\
 "$WPSETTER sets the 'wrong' wallpaper. Transparency for fluxbox and
 apps like aterm and xchat won't work right with it. Consider installing
-chbg, wmsetbg (from windowmaker) or Esetroot (from Eterm) and I'll use
+feh, wmsetbg (from windowmaker) or Esetroot (from Eterm) and I'll use
 them instead."
 
 standardok=\
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 079641d..0887d4f 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -22,7 +22,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-# $Id: fluxbox-generate_menu.in,v 1.1 2003/11/15 19:29:18 fluxgen Exp $
+# $Id: fluxbox-generate_menu.in,v 1.2 2003/11/23 01:19:01 rathnor Exp $
 
 #
 # Portability notes:
@@ -84,7 +84,7 @@ Options:
 
 
 Files:
-    ~/.fluxbux/usermenu     your own submenu which will be included in the menu
+    ~/.fluxbox/usermenu     your own submenu which will be included in the menu
     ~/.fluxbox/menuconfig   rc file for fluxbox-generate_menu
 
 EOF
@@ -877,7 +877,7 @@ append_submenu "${NETMENU}"
     append_menu_end
 
     append_submenu ftp
-    normal_find gftp IglooFTP-PRO
+        normal_find gftp IglooFTP-PRO
         find_it pftp      append "[exec]   (pftp) {${DEFAULT_TERM} -e pftp}"
         find_it ftp       append "[exec]   (ftp) {${DEFAULT_TERM} -e ftp}"
         find_it lftp      append "[exec]   (lftp) {${DEFAULT_TERM} -e lftp}"
@@ -907,7 +907,7 @@ append_menu_end
 append_submenu "${MULTIMEDIAMENU}"
        append_submenu "${GRAPHICMENU}"
                normal_find gimp xv gqview showimg xpaint kpaint kiconedit \
-               ee xscreensaver-demo xlock
+               ee xzgv xscreensaver-demo xlock
                find_it xnview           append "[exec] (xnview browser) {xnview -browser}"
                find_it blender          append "[exec] (blender) {blender -w}"
                find_it gears            append "[exec] (Mesa gears) {gears}"
@@ -950,7 +950,6 @@ append_submenu "${OFFICEMENU}"
     find_it oopadmin append "[exec] (OO Printer Administration) {oopadmin}"
     find_it mrproject append "[exec] (Mr.Project) {mrproject}"
     find_it soffice append "[exec] (Star Office) {soffice}"
-
     normal_find abiword kword wordperfect katoob acroread xpdf
 append_menu_end
 
@@ -960,7 +959,7 @@ append_submenu "${GAMESMENU}"
         gnotski iagno knights eboard xboard freecell pysol \
         gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \
         quake2 quake3 skoosh same-gnome enigma xbill icebreaker
-        find_it et append "[exec] (Enemy Territory) {et}"
+    find_it et append "[exec] (Enemy Territory) {et}"
 append_menu_end
 
 # We'll only use this once