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

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2007-12-04 5:49:53
Message-ID: 1196747393.249958.9889.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 744698 by vkrause:

Merged revisions 744689 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r744689 | vkrause | 2007-12-04 05:39:34 +0100 (Tue, 04 Dec 2007) | 5 lines
  
  Fix crash due to calling serverSyncInternal() too often/too early.
  Patch by Frank.
  
  Kolab issue 2270
........


 _M            . (directory)  
 M  +3 -4      kmail/kmfoldercachedimap.cpp  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,7293 \
06,729611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884 \
/trunk/KDE/kdepim:1-738080  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,72 \
9611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689 \
                /trunk/KDE/kdepim:1-738080
--- branches/work/kdab-post-4.0/kdepim/kmail/kmfoldercachedimap.cpp #744697:744698
@@ -2007,8 +2007,9 @@
   }
 
   mProgress += 5;
-  if ( mToBeDeletedAfterRescue.isEmpty() )
-    serverSyncInternal();
+
+  // just in case there is nothing to rescue
+  slotRescueDone( 0 );
 }
 
 void KMFolderCachedImap::listDirectory2()
@@ -3006,8 +3007,6 @@
       }
     }
   }
- if ( root )
-    slotRescueDone( 0 ); // just in case there is nothing to rescue
 }
 
 void KMFolderCachedImap::slotRescueDone(KMCommand * command)


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