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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-11-11 18:14:09
Message-ID: 1226427249.204549.14224.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 882942 by vkrause:

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

........
  r882936 | vkrause | 2008-11-11 19:04:57 +0100 (Tue, 11 Nov 2008) | 6 lines
  
  Backport SVN commit 882933 by tilladam from enterprise4 branch:
  
  Make sure to reload the UID map, otherwise it's stale on the next sync
  and might have offsets in it that will lead to mail loss, on the next
  mail sync. Kolab/issue3196.
........


 _M            . (directory)  
 M  +5 -2      kmail/kmfoldercachedimap.h  


** branches/KDE/3.5/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,76794 \
8-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,775 \
196-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,7 \
78031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780250 \
-780452,780454-780495,780497,780499-780529,780531-782028,782030-783127,783129-783243,783245,7832 \
48-783477,783479-784380,784382-784426,784428-784691,784693-785478,785480-785558,787827,788582-79 \
1440,791443-792201,792203-793304,793306-793471,793473-793538,793540-795763,795765,795767-798445, \
798447-798448,798450-798495,798497-802148,802150-802151,802153-803259,803261-803299,803301-80330 \
8,803310-803380,803383-803397,803399-804993,804995-805347,805349-805427,805429-805459,805461-805 \
824,805826,805828-809708,809710-810236,810238-810302,810304,810306-811205,811207-813547,813549-814372,814374,814376-816024,816
  026-816313,816315-816322,816324-817070,817072-817087,817089-819076,819078-821035,821037-821124 \
,821126-821378,821380-821648,821650-822268,822270-824277,824279-825075,825077-825083,825085-8263 \
54,826356-827612,827614-827891,827893-827944,827946-827949,827951-830477,830479-830875,830877-83 \
0932,830934-836103,836105-836275,836278-836391,836393-836428,836430-837231,837233-837624,837626,840224-840428,840430-840706,840708-840710,840712-843750,843760,858460
  + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767946,767948 \
-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-772316,772318-775194,7751 \
96-775202,775204,775207-775211,775213-778001,778003-778004,778007,778010-778011,778013-778029,77 \
8031-778727,778729-779448,779450-779482,779484-779505,779507-779852,779854-779994,780211,780250- \
780452,780454-780495,780497,780499-780529,780531-782028,782030-783127,783129-783243,783245,78324 \
8-783477,783479-784380,784382-784426,784428-784691,784693-785478,785480-785558,787827,788582-791 \
440,791443-792201,792203-793304,793306-793471,793473-793538,793540-795763,795765,795767-798445,7 \
98447-798448,798450-798495,798497-802148,802150-802151,802153-803259,803261-803299,803301-803308 \
,803310-803380,803383-803397,803399-804993,804995-805347,805349-805427,805429-805459,805461-8058 \
24,805826,805828-809708,809710-810236,810238-810302,810304,810306-811205,811207-813547,813549-814372,814374,814376-816024,816
  026-816313,816315-816322,816324-817070,817072-817087,817089-819076,819078-821035,821037-821124 \
,821126-821378,821380-821648,821650-822268,822270-824277,824279-825075,825077-825083,825085-8263 \
54,826356-827612,827614-827891,827893-827944,827946-827949,827951-830477,830479-830875,830877-83 \
0932,830934-836103,836105-836275,836278-836391,836393-836428,836430-837231,837233-837624,837626,840224-840428,840430-840706,840708-840710,840712-843750,843760,858460,882936
                
--- branches/KDE/3.5/kdepim/kmail/kmfoldercachedimap.h #882941:882942
@@ -213,8 +213,11 @@
   void setSilentUpload( bool silent ) { mSilentUpload = silent; }
   bool silentUpload() { return mSilentUpload; }
 
-  virtual int createIndexFromContents()
-    { return KMFolderMaildir::createIndexFromContents(); }
+  virtual int createIndexFromContents() {
+    const int result = KMFolderMaildir::createIndexFromContents();
+    reloadUidMap();
+    return result;
+  }
 
   int createIndexFromContentsRecursive();
 


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