Finally not necessary to have 2 servicemenus. Readd all/all mimetype

now we test and inform when we try to attach a folder.
13 years ago · b19e82594c
parent 1f3b9bb1eb
commit b19e82594c
3 changed files with 2 additions and 13 deletions
--- 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)
--- a/kmail_addattachmentfolderservicemenu.desktop
+++ b/kmail_addattachmentfolderservicemenu.desktop
@ -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
--- 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]