aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorslakmagik <slakmagik@gmail.com>2011-03-29 04:04:23 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2011-03-29 06:44:51 (GMT)
commit906166f42d9c2cd4012f8adbba31363cac188ce9 (patch)
tree4357b83bcd60f5511179d3e70d33c2dc3ee096a2
parenta8583b79ae3cc1e5bc52df5a46fd341c1bdab22f (diff)
downloadfluxbox-906166f42d9c2cd4012f8adbba31363cac188ce9.zip
fluxbox-906166f42d9c2cd4012f8adbba31363cac188ce9.tar.bz2
make XMESSAGE a variable and use it consistently
Previously, gxmessage was getting substituted in one place and not another.
-rwxr-xr-xutil/fluxbox-generate_menu.in16
1 files changed, 10 insertions, 6 deletions
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 58b9da5..cecc3fe 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1543,6 +1543,13 @@ else
1543 LAUNCHER_CMD=$LAUNCHER 1543 LAUNCHER_CMD=$LAUNCHER
1544fi 1544fi
1545 1545
1546# if gxmessage exists, use it; else use xmessage
1547if find_it gxmessage; then
1548 XMESSAGE=gxmessage
1549else
1550 XMESSAGE=xmessage
1551fi
1552
1546# Start of menu 1553# Start of menu
1547cat << EOF > ${MENUFILENAME} 1554cat << EOF > ${MENUFILENAME}
1548# Generated by fluxbox-generate_menu 1555# Generated by fluxbox-generate_menu
@@ -1864,11 +1871,8 @@ append_submenu "${FBSETTINGSMENU}"
1864 append_submenu "${TOOLS}" 1871 append_submenu "${TOOLS}"
1865 normal_find fluxconf fluxkeys fluxmenu 1872 normal_find fluxconf fluxkeys fluxmenu
1866 find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}" 1873 find_it fbpanel append "[exec] (Fluxbox panel) {fbpanel}"
1867 # if gxmessage exists, use it; else use xmessage 1874 find_it $XMESSAGE append \
1868 find_it gxmessage append \ 1875 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|$XMESSAGE -file - -center}"
1869 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|gxmessage -file - -center}" || \
1870 find_it xmessage append \
1871 "[exec] (${WINDOWNAME}) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}"
1872 find_it import append "[exec] (${SCREENSHOT} - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}" 1876 find_it import append "[exec] (${SCREENSHOT} - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg}"
1873 find_it import append "[exec] (${SCREENSHOT} - PNG) {import screenshot.png && display -resize 50% screenshot.png}" 1877 find_it import append "[exec] (${SCREENSHOT} - PNG) {import screenshot.png && display -resize 50% screenshot.png}"
1874 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {$LAUNCHER_CMD}" 1878 find_it ${LAUNCHER} append "[exec] (${RUNCOMMAND}) {$LAUNCHER_CMD}"
@@ -1894,7 +1898,7 @@ append_submenu "${FBSETTINGSMENU}"
1894 append "[commanddialog] (${FLUXBOXCOMMAND})" 1898 append "[commanddialog] (${FLUXBOXCOMMAND})"
1895 append "[reconfig] (${RELOADITEM})" 1899 append "[reconfig] (${RELOADITEM})"
1896 append "[restart] (${RESTARTITEM})" 1900 append "[restart] (${RESTARTITEM})"
1897 append "[exec] (${ABOUTITEM}) {(@pkgprefix@fluxbox@pkgsuffix@ -v; @pkgprefix@fluxbox@pkgsuffix@ -info | sed 1d) | xmessage -file - -center}" 1901 append "[exec] (${ABOUTITEM}) {(@pkgprefix@fluxbox@pkgsuffix@ -v; @pkgprefix@fluxbox@pkgsuffix@ -info | sed 1d) | $XMESSAGE -file - -center}"
1898 append "[separator]" 1902 append "[separator]"
1899 append "[exit] (${EXITITEM})" 1903 append "[exit] (${EXITITEM})"
1900 1904