Merged revisions 1039246,1039376,1039553,1039565,1039588-1039589,1039595,1039608,1039657 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1039246 | vkrause | 2009-10-23 09:06:24 +0200 (Fri, 23 Oct 2009) | 2 lines
  
  adapt to EntityDisplayAttribute changes
................
  r1039376 | scripty | 2009-10-23 11:35:07 +0200 (Fri, 23 Oct 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1039553 | winterz | 2009-10-23 21:53:03 +0200 (Fri, 23 Oct 2009) | 22 lines
  
  Blocked revisions 1039548 via svnmerge
  
  ................
    r1039548 | winterz | 2009-10-23 15:47:28 -0400 (Fri, 23 Oct 2009) | 16 lines
    
    Merged revisions 1039545 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1039545 | winterz | 2009-10-23 15:37:39 -0400 (Fri, 23 Oct 2009) | 9 lines
      
      when declining, don't complain about a missing invitation in your calendar if you
      haven't put it there yet.
      kolab/issue3922
      
      also, use information dialogs instead of error dialogs to tell the user that
      the invitation is missing from their calendar.
      
      MERGE: e4 (already in trunk)
    ........
  ................
................
  r1039565 | winterz | 2009-10-23 22:19:29 +0200 (Fri, 23 Oct 2009) | 21 lines
  
  Blocked revisions 1039564 via svnmerge
  
  ................
    r1039564 | winterz | 2009-10-23 16:18:12 -0400 (Fri, 23 Oct 2009) | 15 lines
    
    Recorded merge of revisions 1039539 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1039539 | winterz | 2009-10-23 15:18:14 -0400 (Fri, 23 Oct 2009) | 8 lines
      
      lots of cleanups to avoid using magic number for incidence changing stuff.
      also pass real parent pointers to incidence changing stuff.
      
      all this is preparation to a handful of bug fixes I will be making
      for some groupware things to come.
      
      MERGE: e4 (already in trunk)
    ........
  ................
................
  r1039588 | djarvie | 2009-10-24 00:00:14 +0200 (Sat, 24 Oct 2009) | 1 line
  
  Remove redundant code
................
  r1039589 | djarvie | 2009-10-24 00:01:42 +0200 (Sat, 24 Oct 2009) | 3 lines
  
  Fix dialogue closing after error message displayed, and error message not being repeated
  if edit audio alarm dialogue OK is clicked again.
................
  r1039595 | djarvie | 2009-10-24 00:14:12 +0200 (Sat, 24 Oct 2009) | 1 line
  
  Minor comment
................
  r1039608 | winterz | 2009-10-24 00:49:27 +0200 (Sat, 24 Oct 2009) | 9 lines
  
  Blocked revisions 1039607 via svnmerge
  
  ........
    r1039607 | winterz | 2009-10-23 18:47:24 -0400 (Fri, 23 Oct 2009) | 4 lines
    
    compile++ we don't use CamelCase kdepimlibs headers in e4.
    MERGE: none
  ........
................
  r1039657 | scripty | 2009-10-24 11:05:16 +0200 (Sat, 24 Oct 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1040445