File r1135440-bko#236538-akonadi-race-self-test-fals... of Package kdepimlibs4

Overview Repositories Revisions Requests Users Attributes Meta

File r1135440-bko#236538-akonadi-race-self-test-false-negative.diff of Package kdepimlibs4 (Revision d0967344238cea2303e40655e7cee8e9)

Currently displaying revision d0967344238cea2303e40655e7cee8e9 , Show latest

Index: akonadi/agentmanager_p.h
===================================================================
--- akonadi/agentmanager_p.h	(revision 1135439)
+++ akonadi/agentmanager_p.h	(revision 1135440)
@@ -40,7 +40,7 @@
 
   public:
     AgentManagerPrivate( AgentManager *parent )
-      : mParent( parent )
+      : mParent( parent ), mManager( 0 )
     {
     }
 
@@ -59,6 +59,7 @@
     void agentInstanceWarning( const QString&, const QString& );
     void agentInstanceError( const QString&, const QString& );
     void agentInstanceOnlineChanged( const QString&, bool );
+    void serviceOwnerChanged( const QString&, const QString&, const QString& );
 
     /**
      * Reads the information about all known agent types from the serverside
@@ -79,6 +80,8 @@
     AgentInstance fillAgentInstance( const QString &identifier ) const;
     AgentInstance fillAgentInstanceLight( const QString &identifier ) const;
 
+    void createDBusInterface();
+
     static AgentManager *mSelf;
 
     AgentManager *mParent;
Index: akonadi/agentmanager.cpp
===================================================================
--- akonadi/agentmanager.cpp	(revision 1135439)
+++ akonadi/agentmanager.cpp	(revision 1135440)
@@ -33,6 +33,7 @@
 using namespace Akonadi;
 
 // @cond PRIVATE
+#define AKONADI_CONTROL_SERVICE QLatin1String( "org.freedesktop.Akonadi.Control" )
 
 AgentInstance AgentManagerPrivate::createInstance( const AgentType &type )
 {
@@ -178,6 +179,17 @@
   emit mParent->instanceNameChanged( instance );
 }
 
+void AgentManagerPrivate::serviceOwnerChanged( const QString &service, const QString &oldOwner, const QString &newOwner )
+{
+  Q_UNUSED( oldOwner );
+  Q_UNUSED( newOwner );
+
+  if ( service != AKONADI_CONTROL_SERVICE )
+    return;
+
+  createDBusInterface();
+}
+
 void AgentManagerPrivate::readAgentTypes()
 {
   QDBusReply<QStringList> types = mManager->agentTypes();
@@ -263,55 +275,72 @@
   return instance;
 }
 
-AgentManager* AgentManagerPrivate::mSelf = 0;
-
-AgentManager::AgentManager()
-  : QObject( 0 ), d( new AgentManagerPrivate( this ) )
+void AgentManagerPrivate::createDBusInterface()
 {
-  d->mManager = new org::freedesktop::Akonadi::AgentManager( QLatin1String( "org.freedesktop.Akonadi.Control" ),
-                                                     QLatin1String( "/AgentManager" ),
-                                                     QDBusConnection::sessionBus(), this );
+  mTypes.clear();
+  mInstances.clear();
 
-  connect( d->mManager, SIGNAL( agentTypeAdded( const QString& ) ),
-           this, SLOT( agentTypeAdded( const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentTypeRemoved( const QString& ) ),
-           this, SLOT( agentTypeRemoved( const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceAdded( const QString& ) ),
-           this, SLOT( agentInstanceAdded( const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceRemoved( const QString& ) ),
-           this, SLOT( agentInstanceRemoved( const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceStatusChanged( const QString&, int, const QString& ) ),
-           this, SLOT( agentInstanceStatusChanged( const QString&, int, const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceProgressChanged( const QString&, uint, const QString& ) ),
-           this, SLOT( agentInstanceProgressChanged( const QString&, uint, const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceNameChanged( const QString&, const QString& ) ),
-           this, SLOT( agentInstanceNameChanged( const QString&, const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceWarning( const QString&, const QString& ) ),
-           this, SLOT( agentInstanceWarning( const QString&, const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceError( const QString&, const QString& ) ),
-           this, SLOT( agentInstanceError( const QString&, const QString& ) ) );
-  connect( d->mManager, SIGNAL( agentInstanceOnlineChanged( const QString&, bool ) ),
-           this, SLOT( agentInstanceOnlineChanged( const QString&, bool ) ) );
+  delete mManager;
+  mManager = new org::freedesktop::Akonadi::AgentManager( AKONADI_CONTROL_SERVICE,
+                                                          QLatin1String( "/AgentManager" ),
+                                                          QDBusConnection::sessionBus(), mParent );
 
-  if ( d->mManager->isValid() ) {
-    QDBusReply<QStringList> result = d->mManager->agentTypes();
+  QObject::connect( mManager, SIGNAL( agentTypeAdded( const QString& ) ),
+                    mParent, SLOT( agentTypeAdded( const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentTypeRemoved( const QString& ) ),
+                    mParent, SLOT( agentTypeRemoved( const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceAdded( const QString& ) ),
+                    mParent, SLOT( agentInstanceAdded( const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceRemoved( const QString& ) ),
+                    mParent, SLOT( agentInstanceRemoved( const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceStatusChanged( const QString&, int, const QString& ) ),
+                    mParent, SLOT( agentInstanceStatusChanged( const QString&, int, const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceProgressChanged( const QString&, uint, const QString& ) ),
+                    mParent, SLOT( agentInstanceProgressChanged( const QString&, uint, const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceNameChanged( const QString&, const QString& ) ),
+                    mParent, SLOT( agentInstanceNameChanged( const QString&, const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceWarning( const QString&, const QString& ) ),
+                    mParent, SLOT( agentInstanceWarning( const QString&, const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceError( const QString&, const QString& ) ),
+                    mParent, SLOT( agentInstanceError( const QString&, const QString& ) ) );
+  QObject::connect( mManager, SIGNAL( agentInstanceOnlineChanged( const QString&, bool ) ),
+                    mParent, SLOT( agentInstanceOnlineChanged( const QString&, bool ) ) );
+
+  if ( mManager->isValid() ) {
+    QDBusReply<QStringList> result = mManager->agentTypes();
     if ( result.isValid() ) {
       foreach( const QString &type, result.value() ) {
-        const AgentType agentType = d->fillAgentType( type );
-        d->mTypes.insert( type, agentType );
+        const AgentType agentType = fillAgentType( type );
+        mTypes.insert( type, agentType );
       }
     }
 
-    result = d->mManager->agentInstances();
+    result = mManager->agentInstances();
     if ( result.isValid() ) {
       foreach( const QString &instance, result.value() ) {
-        const AgentInstance agentInstance = d->fillAgentInstance( instance );
-        d->mInstances.insert( instance, agentInstance );
+        const AgentInstance agentInstance = fillAgentInstance( instance );
+        mInstances.insert( instance, agentInstance );
       }
     }
   }
 }
 
+AgentManager* AgentManagerPrivate::mSelf = 0;
+
+AgentManager::AgentManager()
+  : QObject( 0 ), d( new AgentManagerPrivate( this ) )
+{
+  d->createDBusInterface();
+
+  // if the D-Bus interface is not valid at this point, watch for the
+  // service to appear and create a new one then
+  if ( !d->mManager->isValid() ) {
+    connect( QDBusConnection::sessionBus().interface(),
+             SIGNAL(serviceOwnerChanged(QString,QString,QString)),
+             SLOT(serviceOwnerChanged(QString,QString,QString)) );
+  }
+}
+
 // @endcond
 
 AgentManager::~AgentManager()
Index: akonadi/agentmanager.h
===================================================================
--- akonadi/agentmanager.h	(revision 1135439)
+++ akonadi/agentmanager.h	(revision 1135440)
@@ -198,6 +198,7 @@
     Q_PRIVATE_SLOT( d, void agentInstanceWarning( const QString&, const QString& ) )
     Q_PRIVATE_SLOT( d, void agentInstanceError( const QString&, const QString& ) )
     Q_PRIVATE_SLOT( d, void agentInstanceOnlineChanged( const QString&, bool ) )
+    Q_PRIVATE_SLOT( d, void serviceOwnerChanged( QString, QString, QString ) )
     //@endcond
 };

Places

File r1135440-bko#236538-akonadi-race-self-test-false-negative.diff of Package kdepimlibs4 (Revision d0967344238cea2303e40655e7cee8e9)

Places