From 6ddd04bacafe12003b229afc036dc4674df48d5f Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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 --- tdeio/CMakeLists.txt | 2 ++ tdeio/Makefile.am | 5 +++++ tdeio/tdeio.magic | 16 ++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 tdeio/tdeio.magic diff --git a/tdeio/CMakeLists.txt b/tdeio/CMakeLists.txt index 054da69f2..5fa0ded6d 100644 --- a/tdeio/CMakeLists.txt +++ b/tdeio/CMakeLists.txt @@ -36,6 +36,8 @@ link_directories( ##### 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 591261d94..fcf2d4c6f 100644 --- a/tdeio/Makefile.am +++ b/tdeio/Makefile.am @@ -34,10 +34,15 @@ libtdeio_la_LIBADD = kssl/libkssl.la tdeio/libtdeiocore.la \ ../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 000000000..9c6f1d158 --- /dev/null +++ b/tdeio/tdeio.magic @@ -0,0 +1,16 @@ +# Type: TDEIO File Types +# From: Timothy Pearson +# +# 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