d9af292
diff -up mc-4.8.0/configure.ac.extensions mc-4.8.0/configure.ac
d9af292
--- mc-4.8.0/configure.ac.extensions	2011-10-17 11:33:45.000000000 +0200
d9af292
+++ mc-4.8.0/configure.ac	2011-11-09 07:03:04.416596731 +0100
d9af292
@@ -78,7 +78,7 @@ AC_PROG_LN_S
95f47c2
 AC_CHECK_TOOL(AR, ar, ar)
95f47c2
 
95f47c2
 dnl Only list browsers here that can be run in background (i.e. with `&')
95f47c2
-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape])
95f47c2
+AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape])
95f47c2
 
95f47c2
 dnl
95f47c2
 dnl Ovverriding mmap support.  This has to be before AC_FUNC_MMAP is used.
d9af292
diff -up mc-4.8.0/misc/mc.ext.in.extensions mc-4.8.0/misc/mc.ext.in
d9af292
--- mc-4.8.0/misc/mc.ext.in.extensions	2011-10-17 11:33:45.000000000 +0200
d9af292
+++ mc-4.8.0/misc/mc.ext.in	2011-11-09 07:04:24.981728775 +0100
d9af292
@@ -403,7 +403,7 @@ shell/.ico
dbcd49a
 	Include=image
dbcd49a
 
dbcd49a
 include/image
dbcd49a
-	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (gqview %f &); fi
d9af292
+	Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (xdg-open %f &); fi
dbcd49a
 	View=%view{ascii} identify %f
dbcd49a
 	#View=%view{ascii} asciiview %f
dbcd49a
 
d9af292
@@ -411,7 +411,8 @@ include/image
dbcd49a
 ### Sound files ###
dbcd49a
 
dbcd49a
 regex/\.([wW][aA][vV]|[sS][nN][dD]|[vV][oO][cC]|[aA][uU]|[sS][mM][pP]|[aA][iI][fF][fF]|[sS][nN][dD])$
dbcd49a
-       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
dbcd49a
+	Include=audio
dbcd49a
+#       Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
dbcd49a
 
dbcd49a
 regex/\.([mM][oO][dD]|[sS]3[mM]|[xX][mM]|[iI][tT]|[mM][tT][mM]|669|[sS][tT][mM]|[uU][lL][tT]|[fF][aA][rR])$
dbcd49a
        Open=mikmod %f
d9af292
@@ -421,15 +422,22 @@ regex/\.([wW][aA][wW]22)$
95f47c2
        Open=vplay -s 22 %f
95f47c2
 
95f47c2
 regex/\.([mM][pP]3)$
95f47c2
-	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
-	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
95f47c2
+	Include=audio
95f47c2
+#	Open=if [ "$DISPLAY" = "" ]; then mpg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
+#	View=%view{ascii} mpg123 -vtn1 %f 2>&1 | sed -n '/^Title/,/^Comment/p;/^MPEG/,/^Audio/p'
95f47c2
+
95f47c2
+regex/\.([mM][kK][aA])$
95f47c2
+	Include=audio
95f47c2
 
95f47c2
 regex/\.([oO][gG][gG|aA|vV|xX])$
95f47c2
-	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
dbcd49a
+	Include=audio
dbcd49a
+#	Open=ogg123 %f
95f47c2
+#	Open=if [ "$DISPLAY" = "" ]; then ogg123 %f; else (xmms %f >/dev/null 2>&1 &); fi
95f47c2
 	View=%view{ascii} ogginfo %s
95f47c2
 
95f47c2
 regex/\.([sS][pP][xX]|[fF][lL][aA][cC])$
dbcd49a
-	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
dbcd49a
+	Include=audio
dbcd49a
+#	Open=if [ "$DISPLAY" = "" ]; then play %f; else (xmms %f >/dev/null 2>&1 &); fi
dbcd49a
 
dbcd49a
 regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
dbcd49a
 	Open=timidity %f
d9af292
@@ -438,11 +446,15 @@ regex/\.([wW][mM][aA])$
95f47c2
 	Open=mplayer -vo null %f
95f47c2
 	View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f
95f47c2
 
95f47c2
+include/audio
95f47c2
+	Open=mplayer %f
95f47c2
+	View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p'
95f47c2
 
95f47c2
 ### Play lists ###
95f47c2
 
95f47c2
 regex/\.([mM]3[uU]|[pP][lL][sS])$
95f47c2
-	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
95f47c2
+	Open=mplayer -vo null -playlist %f
95f47c2
+#	Open=if [ -z "$DISPLAY" ]; then mplayer -vo null -playlist %f; else (xmms -p %f >/dev/null 2>&1 &); fi
95f47c2
 
95f47c2
 
95f47c2
 ### Video ###
d9af292
@@ -494,12 +506,12 @@ include/video
95f47c2
 
dbcd49a
 # Postscript
dbcd49a
 type/^PostScript
dbcd49a
-	Open=(gv %f &)
dbcd49a
+	Open=(xdg-open %f &)
dbcd49a
 	View=%view{ascii} ps2ascii %f
dbcd49a
 
dbcd49a
 # PDF
dbcd49a
 type/^PDF
dbcd49a
-	Open=(xpdf %f &)
dbcd49a
+	Open=(xdg-open %f &)
dbcd49a
 	#Open=(acroread %f &)
dbcd49a
 	#Open=(ghostview %f &)
dbcd49a
 	View=%view{ascii} pdftotext %f -
d9af292
@@ -509,7 +521,7 @@ type/^PDF
dbcd49a
 
dbcd49a
 # html
dbcd49a
 regex/\.([hH][tT][mM][lL]?)$
dbcd49a
-	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
f43ef1c
+	Open=xdg-open file://%d/%p 1>&2
dbcd49a
 	View=%view{ascii} links -dump %f 2>/dev/null || w3m -dump %f 2>/dev/null || lynx -dump -force_html %f
95f47c2
 
dbcd49a
 # StarOffice 5.2
d9af292
@@ -527,22 +539,27 @@ shell/.abw
95f47c2
 
95f47c2
 # Microsoft Word Document
95f47c2
 regex/\.([Dd][oO][cCtT]|[Ww][rR][iI])$
95f47c2
-	Open=(abiword %f >/dev/null 2>&1 &)
f43ef1c
+	Open=(xdg-open %f &)
95f47c2
+#	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
95f47c2
 type/^Microsoft\ Word
95f47c2
-	Open=(abiword %f >/dev/null 2>&1 &)
f43ef1c
+	Open=(xdg-open %f &)
95f47c2
+#	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} antiword -t %f || catdoc -w %f || word2x -f text %f - || strings %f
95f47c2
 
95f47c2
 # RTF document
95f47c2
 regex/\.([rR][tT][fF])$
95f47c2
-	Open=(abiword %f >/dev/null 2>&1 &)
f43ef1c
+	Open=(xdg-open %f &)
95f47c2
+#	Open=(abiword %f >/dev/null 2>&1 &)
95f47c2
 
95f47c2
 # Microsoft Excel Worksheet
95f47c2
 regex/\.([xX][lL][sSwW])$
95f47c2
-	Open=(gnumeric %f >/dev/null 2>&1 &)
f43ef1c
+	Open=(xdg-open %f &)
95f47c2
+#	Open=(gnumeric %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} xls2csv %f || strings %f
95f47c2
 type/^Microsoft\ Excel
95f47c2
-	Open=(gnumeric %f >/dev/null 2>&1 &)
f43ef1c
+	Open=(xdg-open %f &)
95f47c2
+#	Open=(gnumeric %f >/dev/null 2>&1 &)
95f47c2
 	View=%view{ascii} xls2csv %f || strings %f
95f47c2
 
95f47c2
 # Use OpenOffice.org to open any MS Office documents
d9af292
@@ -564,7 +581,7 @@ regex/\.([Tt][Ee][Xx])$
d9af292
 
d9af292
 # DjVu
d9af292
 regex/\.(djvu|DJVU)$
d9af292
-	Open=djview %f &
d9af292
+	Open=xdg-open %f &
d9af292
 
d9af292
 ### Miscellaneous ###
d9af292