[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-07-15 17:29:56
Message-ID: 1247678996.031556.16452.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 997274 by tmcguire:

Merged revisions 996755 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r996755 | winterz | 2009-07-14 22:40:26 +0200 (Tue, 14 Jul 2009) | 4 lines
  
  backport SVN commit 996754 by winterz:
  
  Fix kmail crashes on opening a mail containing a (foreign) canceled meeting request
........


 _M            . (directory)  
 M  +4 -2      kcal/incidenceformatter.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932
   + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,996755
--- branches/kdepim/enterprise4/kdepimlibs/kcal/incidenceformatter.cpp #997273:997274
@@ -879,8 +879,10 @@
     //else desc and comments are empty
   } else {
     // non-empty comments
-    for ( int i=0; i < incidence->comments().count(); ++i ) {
-      comments[i] = string2HTML( incidence->comments()[i] );
+    foreach ( const QString &c, incidence->comments() ) {
+      if ( !c.isEmpty() ) {
+        comments += string2HTML( c );
+      }
     }
     if ( !incidence->description().isEmpty() ) {
       // use description too
[prev in list] [next in list] [prev in thread] [next in thread]