From dab5e4adcbec576b43c052a2b23a237983978043 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 5 Dec 2014 12:36:56 -0600
Subject: [PATCH] Properly identify desktop files This resolves a rather major
 glitch with Device Links noted on the mailing list (cherry picked from commit
 6ddd04bacafe12003b229afc036dc4674df48d5f)

---
 kio/CMakeLists.txt |  2 ++
 kio/Makefile.am    |  5 +++++
 kio/kio.magic      | 16 ++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 kio/kio.magic

diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index a27c54a7a..ae7759747 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -35,6 +35,8 @@ link_directories(
 
 ##### other data ################################
 
+install( FILES kio.magic DESTINATION ${CONFIG_INSTALL_DIR}/magic )
+
 install( FILES
     application.desktop kurifilterplugin.desktop
     kcomprfilter.desktop kscan.desktop kdatatool.desktop
diff --git a/kio/Makefile.am b/kio/Makefile.am
index 096d10914..05d9a72b1 100644
--- a/kio/Makefile.am
+++ b/kio/Makefile.am
@@ -34,10 +34,15 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
 	../kwallet/client/libkwalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
+magicdir = $(kde_confdir)/magic
+magic_DATA = kio.magic
+
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
                         kcomprfilter.desktop kscan.desktop kdatatool.desktop \
                         kfileplugin.desktop kcmodule.desktop
 
+EXTRA_DIST = $(kde_mime_DATA)
+
 update_DATA = kioslave.upd
 update_SCRIPTS = useragent.pl proxytype.pl
 updatedir = $(kde_datadir)/kconf_update
diff --git a/kio/kio.magic b/kio/kio.magic
new file mode 100644
index 000000000..383f2d2e3
--- /dev/null
+++ b/kio/kio.magic
@@ -0,0 +1,16 @@
+# Type: KIO File Types
+# From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+#
+# 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