diff options
-rwxr-xr-x | util/fluxbox-generate_menu.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in index c43c5cf..ae2c54f 100755 --- a/util/fluxbox-generate_menu.in +++ b/util/fluxbox-generate_menu.in | |||
@@ -1519,7 +1519,7 @@ if find_it_options $MY_BROWSER; then | |||
1519 | else | 1519 | else |
1520 | [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 | 1520 | [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2 |
1521 | #The precise order is up for debate. | 1521 | #The precise order is up for debate. |
1522 | for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla galeon konqueror dillo netscape w3m amaya links lynx; do | 1522 | for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do |
1523 | if find_it $browser; then | 1523 | if find_it $browser; then |
1524 | DEFAULT_BROWSER=$browser | 1524 | DEFAULT_BROWSER=$browser |
1525 | break | 1525 | break |
@@ -1529,6 +1529,9 @@ fi | |||
1529 | DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'` | 1529 | DEFAULT_BROWSERNAME=`echo $DEFAULT_BROWSER|awk '{print $1}'` |
1530 | DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` | 1530 | DEFAULT_BROWSERNAME=`basename $DEFAULT_BROWSERNAME` |
1531 | 1531 | ||
1532 | if [ -z "$LAUNCHER" ]; then | ||
1533 | LAUNCHER=fbrun | ||
1534 | fi | ||
1532 | 1535 | ||
1533 | # Start of menu | 1536 | # Start of menu |
1534 | cat << EOF > ${MENUFILENAME} | 1537 | cat << EOF > ${MENUFILENAME} |
@@ -1561,7 +1564,7 @@ append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}" | |||
1561 | 1564 | ||
1562 | case "$DEFAULT_BROWSERNAME" in | 1565 | case "$DEFAULT_BROWSERNAME" in |
1563 | links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; | 1566 | links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; |
1564 | firefox|firebird|mozilla|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; | 1567 | firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; |
1565 | konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; | 1568 | konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; |
1566 | opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; | 1569 | opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; |
1567 | MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; | 1570 | MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; |
@@ -1580,7 +1583,7 @@ append_menu_end | |||
1580 | 1583 | ||
1581 | append_submenu "${NETMENU}" | 1584 | append_submenu "${NETMENU}" |
1582 | append_submenu "${BROWSERMENU}" | 1585 | append_submenu "${BROWSERMENU}" |
1583 | normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla dillo netscape vncviewer | 1586 | normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer |
1584 | find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" | 1587 | find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}" |
1585 | find_it opera append "[exec] (opera) {env QT_XFT=true opera}" | 1588 | find_it opera append "[exec] (opera) {env QT_XFT=true opera}" |
1586 | find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" | 1589 | find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" |