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

4 files changed, 12 insertions, 2 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 * );
 
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index d3fce17c2..ee29ce9d3 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -123,7 +123,7 @@ int KontactApp::newInstance()
 int main( int argc, char **argv )
 {
   KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
-                    KAboutData::License_GPL, I18N_NOOP("(C) 2001-2008 The Kontact developers"), 0, "http://kontact.org" );
+                    KAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" );
   about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" );
   about.addAuthor( "Don Sanders", 0, "sanders@kde.org" );
   about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index de4eb2df7..a96085283 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -1026,7 +1026,8 @@ void MainWindow::saveProperties( KConfig *config )
 
 bool MainWindow::queryClose()
 {
-  if ( kapp->sessionSaving() || mReallyClose )
+  //if ( kapp->sessionSaving() || mReallyClose )
+  if ( kapp->sessionSaving() )
     return true;
 
   bool localClose = true;