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

List:       kde-commits
Subject:    branches/KDE/4.5/kdepimlibs
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-08-27 8:15:44
Message-ID: 20100827081544.C1518AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1168707 by vkrause:

Merged revisions 1166311 via svnmerge from 
svn+ssh://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1166311 | vkrause | 2010-08-21 16:05:14 +0200 (Sat, 21 Aug 2010) | 5 lines
  
  Revert 1162863, headers are moved from one content to another here, not
  copied, so we can't just delete them. Fixes a few unit test crashes.
  
  CCMAIL: iamsergio@gmail.com
........


 _M            . (directory)  
 M  +0 -2      kmime/kmime_content.cpp  


--- branches/KDE/4.5/kdepimlibs/kmime/kmime_content.cpp #1168706:1168707
@@ -513,7 +513,6 @@
         // Add to new content.
         main->setHeader( *it );
         // Remove from this content.
-        delete (*it);
         it = h_eaders.erase( it );
       } else {
         ++it;
@@ -576,7 +575,6 @@
     foreach( Headers::Base *h, main->h_eaders ) {
       setHeader( h ); // Will remove the old one if present.
     }
-    qDeleteAll( main->h_eaders );
     main->h_eaders.clear();
 
     // Move the body.
[prev in list] [next in list] [prev in thread] [next in thread]