summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2008-03-17 01:46:34 +0100
committerJose Antonio Ortega Ruiz <jao@gnu.org>2008-03-17 01:46:34 +0100
commitc26d4b7381cb13acd3a0c3eed54ed48bf664798f (patch)
tree8bea9ef0dda1a717baba1af850a910119f153201
parent3db33aee56176a7c75ea682ed4c896293186655a (diff)
downloadmdk-c26d4b7381cb13acd3a0c3eed54ed48bf664798f.tar.gz
mdk-c26d4b7381cb13acd3a0c3eed54ed48bf664798f.tar.bz2
Add extra application mime type for external execs in darwin (closes #17519)
-rw-r--r--mixgtk/Makefile.am4
-rw-r--r--mixgtk/mixgtk_external.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am
index ff69759..fbb06c9 100644
--- a/mixgtk/Makefile.am
+++ b/mixgtk/Makefile.am
@@ -20,8 +20,10 @@ endif
if DARWIN_SYSTEM
EDITOR_CMD = "/usr/bin/open -a TextEdit %s"
+EXTRA_EXECD = -DEXTRA_EXEC_MIME_TYPE
else
EDITOR_CMD = "/usr/bin/xterm -e vi %s"
+EXTRA_EXECD =
endif
if MAKE_GUI
@@ -33,7 +35,7 @@ INCLUDES = -I$(includedir) -I$(top_srcdir) \
-DLOCAL_GLADE_FILE=\""$(srcdir)/mixgtk.glade"\"\
-DDEFAULT_EDITOR_CMD=\"$(EDITOR_CMD)\"\
-DDEFAULT_ASM_CMD="\"$(bindir)/mixasm"\"\
- $(GUILED)
+ $(GUILED) $(EXTRA_EXECD)
LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a\
$(top_builddir)/mixguile/libmixguile.a $(INTLLIBS)
diff --git a/mixgtk/mixgtk_external.c b/mixgtk/mixgtk_external.c
index efe7f8d..fc733e0 100644
--- a/mixgtk/mixgtk_external.c
+++ b/mixgtk/mixgtk_external.c
@@ -102,6 +102,9 @@ init_widgets_ (void)
}
gtk_file_filter_add_mime_type (filter, "application/x-executable");
+#ifdef EXTRA_EXEC_MIME_TYPE
+ gtk_file_filter_add_mime_type (filter, "application/octet-stream");
+#endif
gtk_file_chooser_set_filter
(GTK_FILE_CHOOSER (ext_wdg_[ext_wdg_asm_chooser]), filter);
gtk_file_chooser_set_filter