mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-04-02 13:12:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2820_extd_fix'

Browse Source 
* 2820_extd_fix:
  Fixed libexec hardcoded value
  Added 'View' action to all video formats.
  Fixed the filename escaping issues.
  Ticket #2820: Typo fix 'oofice' -> ooffice
This commit is contained in:
Slava Zanko 2012-06-29 13:20:08 +03:00
commit 3e66455662
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -482,7 +482,11 @@ dnl Libraries used only when building the mc binary
AC_SUBST(MCLIBS)
EXTHELPERSDIR=${prefix}/libexec/${PACKAGE}/ext.d
if test x${libexecdir} = x'${exec_prefix}/libexec'; then
EXTHELPERSDIR=${prefix}/libexec/${PACKAGE}/ext.d
else
EXTHELPERSDIR=${libexecdir}/${PACKAGE}/ext.d
fi
AC_SUBST(EXTHELPERSDIR)
MAN_DATE="$(LC_ALL=C date "+%B %Y")"

1
misc/ext.d/sound.sh
View File

@ -22,6 +22,7 @@ do_view_action() {
tail +13 || file "${MC_EXT_FILENAME}"
;;
*)
cat "${MC_EXT_FILENAME}"
;;
esac
}

1
misc/ext.d/video.sh
View File

@ -12,6 +12,7 @@ do_view_action() {
case "${filetype}" in
*)
cat "${MC_EXT_FILENAME}"
;;
esac
}

7
misc/mc.ext.in
View File

@ -516,6 +516,7 @@ type/WebM
include/video
Open=@EXTHELPERSDIR@/video.sh open ALL_FORMATS
View=%view{ascii} @EXTHELPERSDIR@/video.sh view ALL_FORMATS
### Documents ###
@ -537,11 +538,11 @@ regex/\.([hH][tT][mM][lL]?)$
# StarOffice 5.2
shell/.sdw
Open=@EXTHELPERSDIR@/doc.sh open oofice
Open=@EXTHELPERSDIR@/doc.sh open ooffice
# StarOffice 6 and OpenOffice.org formats
regex/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
Open=@EXTHELPERSDIR@/doc.sh open oofice
Open=@EXTHELPERSDIR@/doc.sh open ooffice
View=%view{ascii} @EXTHELPERSDIR@/doc.sh view odt
# AbiWord
@ -570,7 +571,7 @@ type/^Microsoft\ Excel
# Use OpenOffice.org to open any MS Office documents
type/^Microsoft\ Office\ Document
Open=@EXTHELPERSDIR@/doc.sh open oofice
Open=@EXTHELPERSDIR@/doc.sh open ooffice
# Framemaker
type/^FrameMaker

4
src/filemanager/ext.c
View File

@ -169,7 +169,7 @@ exec_get_export_variables (vfs_path_t * filename_vpath)
return NULL;
export_vars_string = g_string_new ("MC_EXT_FILENAME=");
g_string_append_printf (export_vars_string, "\"%s\"\nexport MC_EXT_FILENAME\n", text);
g_string_append_printf (export_vars_string, "%s\nexport MC_EXT_FILENAME\n", text);
g_free (text);
for (i = 0; export_variables[i].name != NULL; i++)
@ -178,7 +178,7 @@ exec_get_export_variables (vfs_path_t * filename_vpath)
if (text != NULL)
{
g_string_append_printf (export_vars_string,
"%s=\"%s\"\nexport %s\n", export_variables[i].name, text,
"%s=%s\nexport %s\n", export_variables[i].name, text,
export_variables[i].name);
g_free (text);
}