From b19e82594ce8273f86cdef2073e1578ec5b26711 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Thu, 3 Jan 2013 07:56:38 +0100
Subject: [PATCH] Finally not necessary to have 2 servicemenus. Readd all/all
 mimetype

now we test and inform when we try to attach a folder.
---
 CMakeLists.txt                               |  2 +-
 kmail_addattachmentfolderservicemenu.desktop | 10 ----------
 kmail_addattachmentservicemenu.desktop       |  3 +--
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 kmail_addattachmentfolderservicemenu.desktop

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f85ef9ab..dc8d403b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -302,7 +302,7 @@ if (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
     DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
   )
 
-  install( FILES kmail_addattachmentservicemenu.desktop kmail_addattachmentfolderservicemenu.desktop DESTINATION
+  install( FILES kmail_addattachmentservicemenu.desktop DESTINATION
     ${SERVICES_INSTALL_DIR}/ServiceMenus)
 
 endif (NOT WINCE AND KDEPIM_BUILD_DESKTOP)
diff --git a/kmail_addattachmentfolderservicemenu.desktop b/kmail_addattachmentfolderservicemenu.desktop
deleted file mode 100644
index 9ca76cc8b..000000000
--- a/kmail_addattachmentfolderservicemenu.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Service
-ServiceTypes=KonqPopupMenu/Plugin
-MimeType=inode/directory;
-Actions=attachfolder;
-
-[Desktop Action attachfolder]
-Icon=kmail
-Name=Send Directory as Email Attachment
-Exec=kmail --attach %F
diff --git a/kmail_addattachmentservicemenu.desktop b/kmail_addattachmentservicemenu.desktop
index deedf4ed5..36336c71a 100644
--- a/kmail_addattachmentservicemenu.desktop
+++ b/kmail_addattachmentservicemenu.desktop
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KonqPopupMenu/Plugin
-# all files inherit from application/octet-stream
-MimeType=application/octet-stream;
+MimeType=all/all;
 Actions=sendto;
 
 [Desktop Action sendto]