Branch: master

6ddd04ba 2014-12-05 12:36:56 Timothy Pearson
Properly identify desktop files
This resolves a rather major glitch with Device Links noted on the mailing list
A tdeio/tdeio.magic
M tdeio/CMakeLists.txt
M tdeio/Makefile.am
diff --git a/tdeio/CMakeLists.txt b/tdeio/CMakeLists.txt
index 054da69..5fa0ded 100644
--- a/tdeio/CMakeLists.txt
+++ b/tdeio/CMakeLists.txt
@@ -36,6 +36,8 @@
 
 ##### other data ################################
 
+install( FILES tdeio.magic DESTINATION ${CONFIG_INSTALL_DIR}/magic )
+
 install( FILES
     application.desktop kurifilterplugin.desktop
     kcomprfilter.desktop kscan.desktop kdatatool.desktop
diff --git a/tdeio/Makefile.am b/tdeio/Makefile.am
index 591261d..fcf2d4c 100644
--- a/tdeio/Makefile.am
+++ b/tdeio/Makefile.am
@@ -34,10 +34,15 @@
 	../tdewallet/client/libtdewalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
+magicdir = $(kde_confdir)/magic
+magic_DATA = tdeio.magic
+
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
                         kcomprfilter.desktop kscan.desktop kdatatool.desktop \
                         tdefileplugin.desktop tdecmodule.desktop
 
+EXTRA_DIST = $(kde_mime_DATA)
+
 update_DATA = tdeioslave.upd
 update_SCRIPTS = useragent.pl proxytype.pl
 updatedir = $(kde_datadir)/tdeconf_update
diff --git a/tdeio/tdeio.magic b/tdeio/tdeio.magic
new file mode 100644
index 0000000..9c6f1d1
--- /dev/null
+++ b/tdeio/tdeio.magic
@@ -0,0 +1,16 @@
+# Type: TDEIO File Types
+# From: Timothy Pearson <kb9vqf@...>
+#
+# TDE desktop file
+0		string  [Desktop\ Entry]        application/x-desktop
+!:mime  application/x-desktop
+0		string  [Desktop\ Action        application/x-desktop
+!:mime  application/x-desktop
+0		string	[KDE\ Desktop\ Entry]	application/x-desktop
+!:mime  application/x-desktop
+0		string  \#\ Config\ File        application/x-desktop
+!:mime  application/x-desktop
+0		string	\#\ KDE\ Config\ File	application/x-desktop
+!:mime  application/x-desktop
+0		string	\#\ TDE\ Config\ File	application/x-desktop
+!:mime  application/x-desktop
\ No newline at end of file