• Bertjan Broeksema's avatar
    Merged revisions... · 8a5544a6
    Bertjan Broeksema authored
    Merged revisions 1181272,1181572,1181600,1181606,1181635,1182377,1182387,1182389,1182437-1182438,1182622,1182635,1182638,1182640-1182642,1182733,1182978 via svnmerge from 
    svn+ssh://bbroeksema@svn.kde.org/home/kde/branches/work/akonadi-agentserver-kdepim-runtime
    
    CCMAIL: kde@nyblom.org
    
    ........
      r1181272 | bbroeksema | 2010-09-30 16:59:16 +0200 (Thu, 30 Sep 2010) | 1 line
      
      Merge the changes from branches/work/~vkrause/akonadi-in-process-resource/
    ........
      r1181572 | bbroeksema | 2010-10-01 13:58:27 +0200 (Fri, 01 Oct 2010) | 2 lines
      
      Replace X-Akonadi-RunInAgentServer with X-Akonadi-LaunchMethod
    ........
      r1181600 | bbroeksema | 2010-10-01 15:20:50 +0200 (Fri, 01 Oct 2010) | 3 lines
      
      That was easy! Make the mail dispatcher a plugin which is ran in the
      AgentServer.
    ........
      r1181606 | bbroeksema | 2010-10-01 15:26:58 +0200 (Fri, 01 Oct 2010) | 6 lines
      
      For testing purposes we run the knut resource using the launcher.
      We now have agents that:
      - run as before (in a separate process)
      - are launched into a separate process (knut)
      - run in AgentServer (mail dispatcher)
    ........
      r1181635 | bbroeksema | 2010-10-01 17:23:01 +0200 (Fri, 01 Oct 2010) | 4 lines
      
      To make the Mail Dispatcher Agent suitable for running in the AgentServer
      it shouldn't use QDBusConnection::sessionBus(). Replace these calls with
      the thread safe DBusConnectionPool::threadConnection() equivalent.
    ........
      r1182377 | bbroeksema | 2010-10-04 13:32:59 +0200 (Mon, 04 Oct 2010) | 3 lines
      
      Add a dummy implementation of configure( WId ) to SFR base so that
      moc actually recognizes it as a slot for SFR derived resources.
    ........
      r1182387 | bbroeksema | 2010-10-04 13:57:05 +0200 (Mon, 04 Oct 2010) | 3 lines
      
      AgentBase is a better place to make configure(WId) a slot. Therefore,
      revert r1182377.
    ........
      r1182389 | bbroeksema | 2010-10-04 13:58:57 +0200 (Mon, 04 Oct 2010) | 2 lines
      
      Make the ical resource a plugin that runs in the agent server.
    ........
      r1182437 | bbroeksema | 2010-10-04 17:13:29 +0200 (Mon, 04 Oct 2010) | 9 lines
      
      For now disable the following SFR based resources:
      - kdeaccounts
      - vcard
      - mbox
      
      Currently I'm working on making SFR based resources suitable for running
      in the AgentServer and this requires changes to how the resources deal with
      settings. ICal will be the first, the obove will follow soon.
    ........
      r1182438 | bbroeksema | 2010-10-04 17:14:50 +0200 (Mon, 04 Oct 2010) | 4 lines
      
      Singletons don't work when running multiple resource instances in the same
      thread. Adapt the SingleFileResource class to this by requiring the settings
      to be a member of the class in stead of being a singleton.
    ........
      r1182622 | bbroeksema | 2010-10-05 10:23:07 +0200 (Tue, 05 Oct 2010) | 3 lines
      
      Adapt the kdeaccounts resource to the fact that Settings should not
      be a Singleton anymore.
    ........
      r1182635 | bbroeksema | 2010-10-05 11:02:13 +0200 (Tue, 05 Oct 2010) | 1 line
      
      Make sure that the notes resource is launched in the AgentServer as well
    ........
      r1182638 | bbroeksema | 2010-10-05 11:03:43 +0200 (Tue, 05 Oct 2010) | 2 lines
      
      Adapt and reenable the mbox resource for running in the AgentServer.
    ........
      r1182640 | bbroeksema | 2010-10-05 11:04:56 +0200 (Tue, 05 Oct 2010) | 1 line
      
      Forgot to save, adapt the desktop file as well
    ........
      r1182641 | bbroeksema | 2010-10-05 11:15:01 +0200 (Tue, 05 Oct 2010) | 3 lines
      
      And last but not least, also adapt the vcard SFR for running in
      the AgentServer.
    ........
      r1182642 | bbroeksema | 2010-10-05 11:20:31 +0200 (Tue, 05 Oct 2010) | 2 lines
      
      Use the DBusConnectionPool in resources that run in the AgentServer.
    ........
      r1182733 | bbroeksema | 2010-10-05 15:51:58 +0200 (Tue, 05 Oct 2010) | 7 lines
      
      The MailDispatcherAgent randomly creates widgets while running (e.g. to
      ask for a password). This makes it unsuitable for running in a thread. That is,
      only when we know when and where widgets are created we might be able to
      redirect the call to the main thread (as we did for AgentBase::configure()).
      
      Therefore, run the MDA using the AgentLauncher method.
    ........
      r1182978 | bbroeksema | 2010-10-06 09:26:51 +0200 (Wed, 06 Oct 2010) | 1 line
      
      Install the plugin in the right directory
    ........
    
    svn path=/trunk/KDE/kdepim/runtime/; revision=1184805
    8a5544a6
singlefileresource.h 10 KB