From 84505e56e2e8fee2454d3492782d08d555256e09 Mon Sep 17 00:00:00 2001
From: rathnor <rathnor>
Date: Sun, 22 Aug 2004 03:45:03 +0000
Subject: [PATCH] preliminary icon support in fluxbox-generate_menu

---
 ChangeLog                     |  4 ++++
 util/fluxbox-generate_menu.in | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a72bd81..3fae2bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.10:
+*04/08/22:
+  * Preliminary basic support for icons in fluxbox-generate_menu (Han)
+    - put a <progname>.xpm into ~/.fluxbox/icons. e.g. Eterm.xpm
+    fluxbox-generate_menu.in
 *04/08/19:
   * Fixes to make nroff not report errors for fbsetbg.1 (Han)
     fbsetbg.1
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 112184b8..a41ecbdd 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.26 2004/08/19 00:29:10 fluxgen Exp $
+# $Id: fluxbox-generate_menu.in,v 1.27 2004/08/22 03:45:03 rathnor Exp $
 
 #
 # Portability notes:
@@ -143,7 +143,13 @@ case `uname` in
 esac
 
 append() {
-    echo "      $*" >> ${MENUFILENAME}
+    echo -n "      $*" >> ${MENUFILENAME}
+    execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
+    if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
+        echo "<${HOME}/.fluxbox/icons/$execname.xpm>"  >> ${MENUFILENAME}
+    else
+        echo >> ${MENUFILENAME}
+    fi
 }
 
 append_menu() {