dcop->dbus

svn path=/trunk/KDE/kdepim/; revision=617907

CMakeLists.txt

@@ -310,7 +310,7 @@ install( FILES kmail.antispamrc kmail.antivirusrc  DESTINATION ${CONFIG_INSTALL_
 install( FILES tips  DESTINATION ${DATA_INSTALL_DIR}/kmail)
 install( FILES kmail_config_misc.desktop kmail_config_appearance.desktop     kmail_config_identity.desktop kmail_config_accounts.desktop kmail_config_composer.desktop     kmail_config_security.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
 install( FILES kmcomposerui.rc kmmainwin.rc kmreadermainwin.rc kmail.notifyrc kmail_part.rc  DESTINATION ${DATA_INSTALL_DIR}/kmail)
-install( FILES dcopmail.desktop dcopimap.desktop  DESTINATION ${SERVICETYPES_INSTALL_DIR})
+install( FILES dbusmail.desktop dbusimap.desktop  DESTINATION ${SERVICETYPES_INSTALL_DIR})
 install( FILES application_octetstream.desktop  DESTINATION ${DATA_INSTALL_DIR}/kmail/plugins/bodypartformatter)
 install( FILES kmail.upd  DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
 install(PROGRAMS upgrade-transport.pl kmail-pgpidentity.pl upgrade-signature.pl kmail-upd-identities.pl kmail-3.1-use-UOID-for-identities.pl kmail-3.1-update-new-mail-notification-settings.pl kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl kmail-3.2-update-loop-on-goto-unread-settings.sh kmail-3.2-misc.sh kmail-3.3-use-ID-for-accounts.pl kmail-3.3-move-identities.pl kmail-3.3-aegypten.pl kmail-3.3-split-sign-encr-keys.sh kmail-3.3-misc.pl kmail-3.3b1-misc.pl kmail-3.4-misc.pl kmail-3.4.1-update-status-filters.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})

dbusimap.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=ServiceType
+X-KDE-ServiceType=DBUS/ResourceBackend/IMAP
+Comment=Mail program with a DBUS interface

dbusmail.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=ServiceType
+X-KDE-ServiceType=DBUS/Mailer
+Comment=Mail program with a DBUS interface

dcopimap.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=ServiceType
-X-KDE-ServiceType=DCOP/ResourceBackend/IMAP
-Comment=Mail program with a DCOP interface
-Comment[fr]=Programme de messagerie avec une interface DCOP
-Comment[x-test]=xxMail program with a DCOP interfacexx

dcopmail.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=ServiceType
-X-KDE-ServiceType=DCOP/Mailer
-Comment=Mail program with a DCOP interface
-Comment[fr]=Programme de messagerie avec une interface DCOP
-Comment[x-test]=xxMail program with a DCOP interfacexx