Skip to content
  • Volker Krause's avatar
    SVN_MERGE · 3baa81c2
    Volker Krause authored
    Merged revisions 1035702,1035710,1035722,1035733,1035778,1035836,1035884,1036006,1036052,1036055,1036132,1036135,1036186,1036269,1036303,1036326,1036362,1036364-1036365 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ........
      r1035702 | vkrause | 2009-10-15 19:24:14 +0200 (Thu, 15 Oct 2009) | 2 lines
      
      Use the OTP in async mode.
    ........
      r1035710 | coles | 2009-10-15 19:43:44 +0200 (Thu, 15 Oct 2009) | 3 lines
      
      Minor proof-reading changes, mostly typos.  Good to see these sorts of useful strings being added :).
    ........
      r1035722 | coles | 2009-10-15 20:03:50 +0200 (Thu, 15 Oct 2009) | 5 lines
      
      Minor string change: cancelled -> canceled (British to US English).
      
      SVN_SILENT
    ........
      r1035733 | coles | 2009-10-15 21:01:46 +0200 (Thu, 15 Oct 2009) | 3 lines
      
      Proof-reading blogilo.
    ........
      r1035778 | momeny | 2009-10-15 22:46:08 +0200 (Thu, 15 Oct 2009) | 1 line
      
      Version changed to 1.0.1
    ........
      r1035836 | djarvie | 2009-10-16 01:44:03 +0200 (Fri, 16 Oct 2009) | 2 lines
      
      Bug 210552: fix crash when calendars are updated at login, during session restoration.
    ........
      r1035884 | vkrause | 2009-10-16 08:20:42 +0200 (Fri, 16 Oct 2009) | 2 lines
      
      adapt to Qt 4.6 and recent EntityDisplayAttribute changes
    ........
      r1036006 | scripty | 2009-10-16 11:47:34 +0200 (Fri, 16 Oct 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ........
      r1036052 | mlaurent | 2009-10-16 14:18:19 +0200 (Fri, 16 Oct 2009) | 2 lines
      
      Fix warning with qt 4.6
    ........
      r1036055 | ervin | 2009-10-16 14:25:27 +0200 (Fri, 16 Oct 2009) | 16 lines
      
      Put in place a better logic for the management of IDLE within the
      resource. Mainly only triggers the collection resync if recent or total
      count of messages changed from the last update we got in this session.
      And since we have to start with a select we have numbers to start with.
      
      Why did it get modified like that? Easy, previously we used recent as if
      it was like unseen, while it's not. And the recent information doesn't
      update for our IdleJob because it's listening on another session than
      the main one which actually pump the data. Since the server might insulate
      the clients from each others in such a case, the logic can't be based on
      absolute numbers, but only on relative ones (as in "did it change from
      last time?")
      
      Looks like on of those "oh it'll be easy to fix" gone mad.
    ........
      r1036132 | trueg | 2009-10-16 18:54:44 +0200 (Fri, 16 Oct 2009) | 1 line
      
      Reuse Soprano API instead of doing it manually.
    ........
      r1036135 | vkrause | 2009-10-16 18:56:51 +0200 (Fri, 16 Oct 2009) | 2 lines
      
      let there be icons
    ........
      r1036186 | winterz | 2009-10-16 20:54:10 +0200 (Fri, 16 Oct 2009) | 3 lines
      
      remove unused resourceRequest()
      MERGE: none
    ........
      r1036269 | bbigras | 2009-10-16 23:35:41 +0200 (Fri, 16 Oct 2009) | 1 line
      
      AgentInstance::abort -> AgentInstance::abortCurrentTask
    ........
      r1036303 | tokoe | 2009-10-17 01:15:24 +0200 (Sat, 17 Oct 2009) | 2 lines
      
      Set explicitly that we use hierarchical remote identifiers
    ........
      r1036326 | bbigras | 2009-10-17 02:38:30 +0200 (Sat, 17 Oct 2009) | 2 lines
      
      Fix messageviewer build with --as-needed.
      Patch by Jonathan Callen, thanks
    ........
      r1036362 | tokoe | 2009-10-17 09:24:58 +0200 (Sat, 17 Oct 2009) | 2 lines
      
      link with gold
    ........
      r1036364 | vkrause | 2009-10-17 09:25:43 +0200 (Sat, 17 Oct 2009) | 2 lines
      
      compile
    ........
      r1036365 | tokoe | 2009-10-17 09:25:48 +0200 (Sat, 17 Oct 2009) | 2 lines
      
      Rename Observer2 to ObserverV2
    ........
    
    svn path=/branches/work/akonadi-ports/kdepim/; revision=1036374
    3baa81c2