SVN commit 1184785 by bbroeksema: CCMAIL: kde@nyblom.org Merged revisions 1178274,1178282,1178288,1178303,1178625,1178671,1181282,1181598,1181639,1182324,1182386,1182442 via svnmerge from svn+ssh://bbroeksema@svn.kde.org/home/kde/branches/work/kdepimlibs-agentserver ........ r1178274 | bbroeksema | 2010-09-22 17:47:17 +0200 (Wed, 22 Sep 2010) | 2 lines Namespace DBusConnectionPool and add a note about usage. ........ r1178282 | bbroeksema | 2010-09-22 18:16:13 +0200 (Wed, 22 Sep 2010) | 3 lines Remove the sessionBus() method we added to AgentBase. Start using the threadConnection method from the DBusSessionPool. ........ r1178288 | bbroeksema | 2010-09-22 18:33:16 +0200 (Wed, 22 Sep 2010) | 2 lines Export the method so that it can be used by subtargets in kdepimlibs/akonadi ........ r1178303 | bbroeksema | 2010-09-22 19:16:15 +0200 (Wed, 22 Sep 2010) | 3 lines Use the DBus connection pool instead of QDBusConnection::sessionBus(). This is a workaround as long as the libdbus requirment < 1.4. ........ r1178625 | bbroeksema | 2010-09-23 13:44:27 +0200 (Thu, 23 Sep 2010) | 2 lines Install the dbus connection pool header for use by agents/resources. ........ r1178671 | bbroeksema | 2010-09-23 15:24:16 +0200 (Thu, 23 Sep 2010) | 3 lines Add a new config() method to avoid KGlobal::config() use in the case of in-process agents. ........ r1181282 | bbroeksema | 2010-09-30 17:25:58 +0200 (Thu, 30 Sep 2010) | 4 lines Don't assert when it's the same thread but create a componentData as well. This happens when an agent *plugin* is launched in its own process. This is a QApplication and will therefore not register KGlobal*. ........ r1181598 | bbroeksema | 2010-10-01 15:02:03 +0200 (Fri, 01 Oct 2010) | 5 lines When the Agent runs in the main thread, but hasLocalData() returns true, it means that the agent was launched by akonadi_agent_launcher and the created main component in stead of KGlobal::mainComponent should be used. ........ r1181639 | bbroeksema | 2010-10-01 17:41:02 +0200 (Fri, 01 Oct 2010) | 3 lines Add some documentation about creating agents that have to run in the AgentServer. ........ r1182324 | bbroeksema | 2010-10-04 10:25:03 +0200 (Mon, 04 Oct 2010) | 1 line Ignore qt-creator files ........ r1182386 | bbroeksema | 2010-10-04 13:55:57 +0200 (Mon, 04 Oct 2010) | 2 lines AgentServer requires configure(WId) to be a slot, so let it be. ........ r1182442 | bbroeksema | 2010-10-04 17:27:41 +0200 (Mon, 04 Oct 2010) | 3 lines Moving a virtual method is BIC, therefore move configure back to the original place. ........ _M . (directory) M +1 -0 akonadi/CMakeLists.txt M +24 -18 akonadi/agentbase.cpp M +27 -9 akonadi/agentbase.h M +5 -1 akonadi/agentfactory.cpp M +2 -1 akonadi/agentinstancecreatejob.cpp M +4 -2 akonadi/agentmanager.cpp M +2 -1 akonadi/agentsearchinterface.cpp M +3 -1 akonadi/collectionattributessynchronizationjob.cpp M +4 -2 akonadi/contact/actions/qskypedialer.cpp M +1 -1 akonadi/dbusconnectionpool.cpp M +17 -4 akonadi/dbusconnectionpool.h M +5 -3 akonadi/firstrun.cpp M +3 -2 akonadi/job.cpp M +5 -4 akonadi/kmime/tests/localfolderstest.cpp M +4 -1 akonadi/kmime/util.cpp M +3 -2 akonadi/monitor_p.cpp M +3 -3 akonadi/preprocessorbase_p.cpp M +4 -4 akonadi/resourcebase.cpp M +5 -3 akonadi/resourcescheduler.cpp M +3 -1 akonadi/resourcesynchronizationjob.cpp M +4 -3 akonadi/selftestdialog.cpp M +9 -8 akonadi/servermanager.cpp M +5 -4 akonadi/specialcollectionshelperjobs.cpp M +3 -1 akonadi/tests/benchmarker/maketest.cpp M +3 -2 akonadi/tests/test_utils.h M +6 -4 akonadi/tests/testenvironmenttest.cpp M +2 -1 akonadi/tests/testrunner/setup.cpp M +2 -1 akonadi/transportresourcebase.cpp http://websvn.kde.org/?view=rev&revision=1184785