Merged revisions 1141695-1141696,1141700,1141712,1141721,1141727,1141729,1141734,1141771,1141774-1141775,1141790,1141847,1141854,1141863,1141884-1141885,1141911,1141940,1141969,1142146 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1141695 | vkrause | 2010-06-23 11:22:38 +0200 (Wed, 23 Jun 2010) | 4 lines
  
  Remove one of our kdgantt copies. This one is outdated (komo branch has
  a much newer version), unused in kdepim and is also no longer referenced
  via svn:external from koffice.
................
  r1141696 | mlaurent | 2010-06-23 11:23:32 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  Don't show collectionstatisticanimation when not necessary ( for example when we want to "jump to folder" etc.)
................
  r1141700 | mlaurent | 2010-06-23 11:40:12 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  Fix UseDistinctSelectionModel bug reported by Till
................
  r1141712 | mlaurent | 2010-06-23 12:11:42 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  Restore config when we change kmail layout
................
  r1141721 | thiago | 2010-06-23 12:32:59 +0200 (Wed, 23 Jun 2010) | 4 lines
  
  If kjots isn't being built, turn it off.
  
  Otherwise the compilation will fail due to kontact trying to build
  its kjots plugin
................
  r1141727 | smartins | 2010-06-23 12:47:22 +0200 (Wed, 23 Jun 2010) | 3 lines
  
  SVN_SILENT:
  Move the assert inside the if.
................
  r1141729 | mlaurent | 2010-06-23 12:54:01 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  const'ify
................
  r1141734 | cgiboudeaux | 2010-06-23 13:11:40 +0200 (Wed, 23 Jun 2010) | 1 line
  
  Revert r1141720. Nonsensical commit. If Grantlee_FOUND is false, BUILD_kjots isn't defined at all.
................
  r1141771 | smartins | 2010-06-23 14:56:59 +0200 (Wed, 23 Jun 2010) | 11 lines
  
  When chosing "both" while resolving a conflict, the incidencehandler would insert
  into m_uidMap an entry with wrong info: the map key was the new incidence's uid, but the map value contained
  the old item's id, not the new one.
  
  We don't even know what the new item id is going to be because we are adding it to imap right now, so we
  just wait for itemsAdded SIGNAL and process it then.
  
  Was causing a crash in Akonadi::Calendar
  
  MERGE: none
................
  r1141774 | mlaurent | 2010-06-23 15:04:06 +0200 (Wed, 23 Jun 2010) | 3 lines
  
  Readd LastSelectedFolder as in kmail1 
  CCMAIL: adam@kde.org
................
  r1141775 | mlaurent | 2010-06-23 15:10:03 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  Don't save last selected folder when we don't use global settings
................
  r1141790 | lfranchi | 2010-06-23 15:57:30 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  When mails fail to be dispatched, mark them queued and to be dispatched manually, otherwise, the user can never send them again.
................
  r1141847 | mlaurent | 2010-06-23 18:40:34 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  const'ify
................
  r1141854 | lfranchi | 2010-06-23 19:01:03 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  Revert 1138275 for Casey.
................
  r1141863 | tokoe | 2010-06-23 19:33:58 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  Fix the enable/disable of 'New Contact (Group)' actions
................
  r1141884 | winterz | 2010-06-23 20:30:39 +0200 (Wed, 23 Jun 2010) | 12 lines
  
  SVN_SILENT:
  Blocked revisions 1140784 via svnmerge
  
  ........
    r1140784 | winterz | 2010-06-21 10:07:56 -0400 (Mon, 21 Jun 2010) | 5 lines
    
    revert the hack for removing a trailing 0 from the attachment.
    might be breaking zip files.
    kolab/issue4407
    MERGE: none
  ........
................
  r1141885 | winterz | 2010-06-23 20:31:24 +0200 (Wed, 23 Jun 2010) | 9 lines
  
  SVN_SILENT:
  Blocked revisions 1140723 via svnmerge
  
  ........
    r1140723 | ludwigreiter | 2010-06-21 08:06:16 -0400 (Mon, 21 Jun 2010) | 1 line
    
    Update after test of newslog 2010-06-18
  ........
................
  r1141911 | lfranchi | 2010-06-23 21:52:50 +0200 (Wed, 23 Jun 2010) | 2 lines
  
  For filters that move to a folder, try twice to get a valid collection for folder id, as when filter is created it might not be ready yet.
................
  r1141940 | tilladam | 2010-06-23 23:08:44 +0200 (Wed, 23 Jun 2010) | 1 line
  
  Be less verbose.
................
  r1141969 | lfranchi | 2010-06-24 00:14:00 +0200 (Thu, 24 Jun 2010) | 2 lines
  
  Read spam flags in message status too.
................
  r1142146 | aholzammer | 2010-06-24 10:09:17 +0200 (Thu, 24 Jun 2010) | 1 line
  
  - merged export from branch
................

svn path=/branches/work/komo/kdepim/runtime/; revision=1142174