Attachment #129559 for bug #173553

View | Details | Raw Unified | Return to bug 173553
Collapse All | Expand All




     [ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
     #The precise order is up for debate.
-    for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
+    for browser in chrome firefox firefox3 mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
         if find_it_options $browser; then
             DEFAULT_BROWSER=$browser
             break

 case "$DEFAULT_BROWSERNAME" in
     links|w3m|lynx)  append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
-    firefox|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
+    chrome|firefox|firefox3|firebird|mozilla|seamonkey|phoenix|galeon|dillo|netscape|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
     konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
-    opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
+    linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;

 append_submenu "${NETMENU}"
     append_submenu "${BROWSERMENU}"
-        normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
+        normal_find chrome firefox firefox3 mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
         find_it links       append "[exec]   (links-graphic) {links -driver x ${HOMEPAGE}}"
-        find_it opera       append "[exec]   (opera) {env QT_XFT=true opera}"
+        find_it linux-opera append "[exec]   (linux-opera) {linux-opera}"

Return to bug 173553

Lines 187-193 Link Here

(-)files/patch-util::fluxbox-generate_menu.in (-3 / +3 lines)
187	[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2	187	[ -n "$MY_BROWSER" ] && echo "Warning: you chose an invalid browser." >&2
188	#The precise order is up for debate.	188	#The precise order is up for debate.
189	- for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do	189	- for browser in firefox mozilla-firefox mozilla-firebird MozillaFirebird opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
190	+ for browser in firefox firefox3 mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do	190	+ for browser in chrome firefox firefox3 mozilla-firefox mozilla-firebird MozillaFirebird linux-opera opera skipstone mozilla seamonkey galeon konqueror dillo netscape w3m amaya links lynx; do
191	if find_it_options $browser; then	191	if find_it_options $browser; then
192	DEFAULT_BROWSER=$browser	192	DEFAULT_BROWSER=$browser
193	break	193	break
Lines 196-202 Link Here
196	case "$DEFAULT_BROWSERNAME" in	196	case "$DEFAULT_BROWSERNAME" in
197	links\|w3m\|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;	197	links\|w3m\|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
198	- firefox\|firebird\|mozilla\|seamonkey\|phoenix\|galeon\|dillo\|netscape\|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;	198	- firefox\|firebird\|mozilla\|seamonkey\|phoenix\|galeon\|dillo\|netscape\|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
199	+ firefox\|firefox3\|firebird\|mozilla\|seamonkey\|phoenix\|galeon\|dillo\|netscape\|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;	199	+ chrome\|firefox\|firefox3\|firebird\|mozilla\|seamonkey\|phoenix\|galeon\|dillo\|netscape\|amaya) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
200	konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;	200	konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
201	- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;	201	- opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
202	+ linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;	202	+ linux-opera) append "[exec] (linux-opera) {linux-opera}" ;;
Lines 209-215 Link Here
209	append_submenu "${NETMENU}"	209	append_submenu "${NETMENU}"
210	append_submenu "${BROWSERMENU}"	210	append_submenu "${BROWSERMENU}"
211	- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer	211	- normal_find firefox mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
212	+ normal_find firefox firefox3 mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer	212	+ normal_find chrome firefox firefox3 mozilla-firefox MozillaFirefox galeon mozilla seamonkey dillo netscape vncviewer
213	find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}"	213	find_it links append "[exec] (links-graphic) {links -driver x ${HOMEPAGE}}"
214	- find_it opera append "[exec] (opera) {env QT_XFT=true opera}"	214	- find_it opera append "[exec] (opera) {env QT_XFT=true opera}"
215	+ find_it linux-opera append "[exec] (linux-opera) {linux-opera}"	215	+ find_it linux-opera append "[exec] (linux-opera) {linux-opera}"