Commit d52d3392 authored by Volker Krause's avatar Volker Krause
Browse files

More agent server preparation, avoid not thread-safe D-Bus methods.

svn path=/trunk/KDE/kdepim/runtime/; revision=1200556
parent 6c4a6245
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <akonadi/collectionfetchscope.h> #include <akonadi/collectionfetchscope.h>
#include <akonadi/entitydisplayattribute.h> #include <akonadi/entitydisplayattribute.h>
#include <akonadi/itemfetchscope.h> #include <akonadi/itemfetchscope.h>
#include <akonadi/dbusconnectionpool.h>
using namespace Akonadi; using namespace Akonadi;
...@@ -39,7 +40,7 @@ ContactsResource::ContactsResource( const QString &id ) ...@@ -39,7 +40,7 @@ ContactsResource::ContactsResource( const QString &id )
{ {
// setup the resource // setup the resource
new SettingsAdaptor( mSettings ); new SettingsAdaptor( mSettings );
QDBusConnection::sessionBus().registerObject( QLatin1String( "/Settings" ), DBusConnectionPool::threadConnection().registerObject( QLatin1String( "/Settings" ),
mSettings, QDBusConnection::ExportAdaptors ); mSettings, QDBusConnection::ExportAdaptors );
changeRecorder()->fetchCollection( true ); changeRecorder()->fetchCollection( true );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment