Major KAddressbook carddav fixes and improvements (should now work with Zimbra once Zimbra fixes a standards compliance issue with contact creation mimetypes)

Fixed handling of close events and save interaction with Kontact and Korganizer

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1141613 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 7 insertions, 0 deletions

diff --git a/korganizer/korganizeriface.h b/korganizer/korganizeriface.h
index dac62e2bf..5a8c7bde8 100644
--- a/korganizer/korganizeriface.h
+++ b/korganizer/korganizeriface.h
@@ -31,6 +31,7 @@ class KOrganizerIface : virtual public DCOPObject
     virtual bool mergeURL(const QString &url) = 0;
     virtual void closeURL() = 0;
     virtual bool saveURL() = 0;
+    virtual bool canQueryClose() = 0;
     virtual bool saveAsURL(const QString &url) = 0;
     virtual QString getCurrentURLasString() const = 0;
     virtual bool editIncidence(const QString &uid) = 0;
diff --git a/korganizer/korganizerifaceimpl.cpp b/korganizer/korganizerifaceimpl.cpp
index 31103432b..5605d7a86 100644
--- a/korganizer/korganizerifaceimpl.cpp
+++ b/korganizer/korganizerifaceimpl.cpp
@@ -90,6 +90,11 @@ bool KOrganizerIfaceImpl::addIncidence( const QString &ical )
   return mActionManager->addIncidence( ical );
 }
 
+bool KOrganizerIfaceImpl::canQueryClose()
+{
+  return mActionManager->queryClose();
+}
+
 void KOrganizerIfaceImpl::loadProfile( const QString& path )
 {
     mActionManager->loadProfile( path );
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 228f1b4fa..b27cd6608 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -49,6 +49,7 @@ public:
   bool mergeURL( const QString &url );
   void closeURL();
   bool saveURL();
+  bool canQueryClose();
   bool saveAsURL( const QString &url );
   QString getCurrentURLasString() const;