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

2 files changed, 9 insertions, 0 deletions

diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 7aef2e6e0..f219661d2 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -212,6 +212,12 @@ void KOrganizerPlugin::processDropEvent( QDropEvent *event )
                               .arg( event->format() ) );
 }
 
+bool KOrganizerPlugin::queryClose() const {
+  KOrganizerIface_stub stub( kapp->dcopClient(), "korganizer", "KOrganizerIface" );
+  bool canClose=stub.canQueryClose();
+  return canClose;
+}
+
 void KOrganizerPlugin::loadProfile( const QString& directory )
 {
   DCOPRef ref( "korganizer", "KOrganizerIface" );
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index df8259961..7d74c830e 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -29,6 +29,7 @@
 #include <kparts/part.h>
 
 #include "kcalendariface_stub.h"
+#include "korganizeriface_stub.h"
 #include "plugin.h"
 #include "uniqueapphandler.h"
 
@@ -44,6 +45,8 @@ class KOrganizerPlugin : public Kontact::Plugin
     virtual bool isRunningStandalone();
     int weight() const { return 400; }
 
+    virtual bool queryClose() const;
+
     bool canDecodeDrag( QMimeSource * );
     void processDropEvent( QDropEvent * );