Merged revisions 961182,963289 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r961182 | tmcguire | 2009-04-29 17:46:41 +0200 (Wed, 29 Apr 2009) | 6 lines
  
  Fix a D-Bus race condition: Wait longer for KMail to register the groupware interface.
  This should fix David's problem of not seeing any reminders when korgac auto-starts
  KMail.
  
  CCMAIL: faure@kde.org
........
  r963289 | winterz | 2009-05-04 14:54:31 +0200 (Mon, 04 May 2009) | 2 lines
  
  include <unistd.h> for usleep()
........

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

kmailicalifaceimpl.cpp

@@ -195,6 +195,7 @@ KMailICalIfaceImpl::KMailICalIfaceImpl()
 
 KMailICalIfaceImpl::~KMailICalIfaceImpl()
 {
+  QDBusConnection::sessionBus().unregisterService( "org.kde.kmail.groupware" );
   qDeleteAll( mExtraFolders );
   qDeleteAll( mAccumulators );
   mAccumulators.clear();
@@ -206,6 +207,11 @@ void KMailICalIfaceImpl::registerWithDBus()
   KMail::registerGroupwareTypes();
   QDBusConnection::sessionBus().registerObject( "/Groupware", this, QDBusConnection::ExportAdaptors );
   new GroupwareAdaptor( this );
+
+  // Register a dummy service, so we can use isServiceRegistered() in other applications
+  // to find out if the KMail groupware services are available.
+  // And no, D-Bus does not provide an easy way to just check for the /Groupware object :(
+  QDBusConnection::sessionBus().registerService( "org.kde.kmail.groupware" );
 }
 
 /* libkcal part of the interface, called from the resources using this