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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-08-28 15:49:54
Message-ID: 1219938594.683931.25598.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 853985 by vkrause:

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

........
  r721425 | vkrause | 2007-10-05 10:18:59 +0200 (Fri, 05 Oct 2007) | 4 lines
  
  Always store the list of locally deleted UIDs.
  
  Kolab issue 2067
........


 _M            . (directory)  
 M  +11 -9     kmail/kmfoldercachedimap.cpp  


** branches/kdepim/enterprise4/kdepim #property svnmerge-integrated
   - /branches/KDE/4.1/kdepim:1-835448,835459-835907,835909-836091,836093-836399,83640 \
1-837908,838076,838632,838637,838639,838644,838790,838809,838811,838979,839014-839015, \
839021,839049,839094,839116,839128,839149,839462-839464,839466,839487,839491,839493,83 \
9528,839555,839605,839607,839633-839634,839666,839683-839684,839697,840219,840356-8408 \
63,840865-841077,841083,841235,841238,841240,841598,841609,841704,841811-842273,842275 \
-843367,843369-845899,845901-846139,846141-847247,847249-848138,848140-848555,848557-8 \
49181,849940,850011,850178,850555-850558,850564,850567,850569,850663,850676,851002,851207-851209,851211,851215-851216,851218,851221 \
/branches/kdepim/enterprise/kdepim:1-709144,709146-709321,709323-709402,709404,709406- \
709411,709413-709431,709433-709472,709474-709478,709480-709487,709489-709850,709852-71 \
0562,710564,710566-710623,710625-710634,710636-710641,710643,710645-711039,711041-7111 \
64,711166-711600,711602-711780,711782-712273,712275-712278,712280-713446,713448,7134  \
50-713461,713463-714100,714102-714449,714451-715217,715219-715232,715234-716226,716228 \
-717292,717294,717296-718340,718342-721121,721123-721424,721426-724381,724383-724384,7 \
24386-724443,724445-728089,728091-728450,728452-728580,728582-729580,729583-731333,731 \
335-731669,731671-731719,731721-731867,731869-731870,731872-732022,732024-733047,73304 \
9-733088,733090-733463,733465-733468,733470-734534,734536,734538-734580,734582,734586- \
734591,734593-735174,735176-735204,735206-735246,735248-735281,735283-735300,735302-73 \
6232,736235-736242,736244-736314,736316-736376,736378-737483,737485-737489,737492-7374 \
95,737497-740441,740443-740446,740448-740459,740461-740471,740473-743887,743889-744692 \
,744694-744707,744709-746931,746933-747591,747593-757104,757106-757110,757112-758210,7 \
58212-758786,758788,758790-758794,758796-759131,759133-759152,759154-759271,759273-759 \
274,759276,759278-759285,759287-760352,760354-761115,761117-761118,761120-761123,761125-761127,761131,761134,761137,761139-761140
  ,761144-761145,761147,761149-761230,761232-761240,761242-761244,761246-761330,761332 \
-761334,761336-761337,761339-761374,761376-761533,761535,761537,761539-761546,761548-7 \
61550,761552-761553,761555-761556,761558-761559,761561,761563-761564,761566-761570,761 \
572,761574-761580,761582-761601,761603-761620,761622-761895,761897-761900,761902-76289 \
8,762900-762904,762906-762907,762910-762921,762923-762988,762990-763015,763017-763023, \
763025-763037,763040-763520,763522-764287,764289-764582,764584-764597,764599,764602-76 \
4604,764606-764610,764612-764617,764619-764627,764629,764631-764670,764672-764679,7646 \
81-764682,764684-764745,764747-764821,764823-764849,764851-764875,764877-764886,764888 \
-764893,764895-765070,765072,765076-765079,765081-765082,765084-765085,765087-765096,7 \
65098-765103,765105-765131,765133-765138,765140,765143,765145-765155,765157-765161,765 \
163-765223,765225,765228-765229,765231-765233,765235,765237-765310,765312-765319,765321-765322,765324-765329,765331-765334,765336-7
  65337,765339-765341,765347,765351,765354-765357,765360-765362,765371,765373-765379,7 \
65381,765383,765385-765577,765579-765693,765695-765736,765738-765739,765742-765745,765 \
747-765749,765751-765753,765757-765760,765762,765764-765765,765767,765769,765773-76577 \
4,765777-765778,765780-765781,765783-765784,765789-765790,765792-765803,765805-765852, \
765854-765856,765858-765874,765876,765878-766054,766056,766058-766085,766087-766088,76 \
6091-766093,766096-766111,766113-766120,766122-766139,766141-766217,766219-766232,7662 \
34-766246,766248-766266,766268-766278,766280-766287,766289-766344,766346-766356,766358 \
-766366,766368-766370,766372-766373,766375-766388,766390-766420,766422-766538,766540-7 \
66734,766736-766749,766751-766768,766770-766774,766776-766780,766782,766784-766789,766 \
791-766831,766833-766834,766836,766838-766898,766900-767026,767028-767029,767031-76704 \
0,767042-767046,767048-767232,767234-767551,767553-767554,767556,767558-767805,767807-767946,767948-767951,767953-768089,768091-768
  401,768403-768683,768685-769139,769141-769318,769320-769322,769324-769354,769356-769 \
705,769707-769924,769926-771105,771107-771207,771209-771251,771253-771697,771699-77230 \
2,772304-772305,772307-772311,772313-772316,772318-773732,773734-774161,774163-775014, \
775017-775035,775037-775040,775042-775194,775196-775202,775204,775207-775211,775213-77 \
8001,778003-778004,778007,778010-778011,778013-778029,778031-778727,778729-779448,7794 \
50-779482,779484-779499,779501-779505,779507-779693,779695-779852,779854-780175,780177 \
-780210,780212-780452,780454-780495,780497,780499-780529,780531-782963,782965-783127,7 \
83129-783243,783245,783248-783477,783479-783566,783568-783846,783848-784380,784383-784 \
691,784693-785053,785055-785315,785318-785478,785480-785562,785564-785569,785571-78738 \
7,787389-787826,787828-788242,788245-788581,788583-788633,788635-791440,791443-793304, \
793306-793471,793473-793538,793540-794733,794735-795763,795765,795767-798444,798447-798448,798450-798495,798497-800070,800072-80016
  7,800169-800440,800442-800614,800616-802138,802140-802148,802150-802151,802153-80325 \
6,803258-803259,803261-803299,803301-803308,803310-803338,803340-803380,803383-803397, \
803399-804108,804110-804615,804617-805460,805701-805702,807761,816314,817071-817101,81 \
7103-821345,821347-821370,821372-821378,821380-821648,821650,821652-823852,823854-8242 \
17,824219-824277,824279-824285,824287-825075,825077-825083,825085-825805,825807-826354 \
,826356-827891,827893-827903,827905-827944,827946-827949,827951-828972,828974-830132,8 \
30134-830477,830479-830549,830551-830875,830877-830932,830934-834241,837624,837626,838 \
287,840224-840649,840651-840684,842115-842659,843189,843750,850540,853423-853426,853428-853431,853433-853494
  + /branches/KDE/4.1/kdepim:1-835448,835459-835907,835909-836091,836093-836399,836401 \
-837908,838076,838632,838637,838639,838644,838790,838809,838811,838979,839014-839015,8 \
39021,839049,839094,839116,839128,839149,839462-839464,839466,839487,839491,839493,839 \
528,839555,839605,839607,839633-839634,839666,839683-839684,839697,840219,840356-84086 \
3,840865-841077,841083,841235,841238,841240,841598,841609,841704,841811-842273,842275- \
843367,843369-845899,845901-846139,846141-847247,847249-848138,848140-848555,848557-84 \
9181,849940,850011,850178,850555-850558,850564,850567,850569,850663,850676,851002,851207-851209,851211,851215-851216,851218,851221 \
/branches/kdepim/enterprise/kdepim:1-709144,709146-709321,709323-709402,709404,709406- \
709411,709413-709431,709433-709472,709474-709478,709480-709487,709489-709850,709852-71 \
0562,710564,710566-710623,710625-710634,710636-710641,710643,710645-711039,711041-7111 \
64,711166-711600,711602-711780,711782-712273,712275-712278,712280-713446,713448,7134  \
50-713461,713463-714100,714102-714449,714451-715217,715219-715232,715234-716226,716228 \
-717292,717294,717296-718340,718342-721121,721123-724381,724383-724384,724386-724443,7 \
24445-728089,728091-728450,728452-728580,728582-729580,729583-731333,731335-731669,731 \
671-731719,731721-731867,731869-731870,731872-732022,732024-733047,733049-733088,73309 \
0-733463,733465-733468,733470-734534,734536,734538-734580,734582,734586-734591,734593- \
735174,735176-735204,735206-735246,735248-735281,735283-735300,735302-736232,736235-73 \
6242,736244-736314,736316-736376,736378-737483,737485-737489,737492-737495,737497-7404 \
41,740443-740446,740448-740459,740461-740471,740473-743887,743889-744692,744694-744707 \
,744709-746931,746933-747591,747593-757104,757106-757110,757112-758210,758212-758786,7 \
58788,758790-758794,758796-759131,759133-759152,759154-759271,759273-759274,759276,759 \
278-759285,759287-760352,760354-761115,761117-761118,761120-761123,761125-761127,761131,761134,761137,761139-761140,761144-761145
  ,761147,761149-761230,761232-761240,761242-761244,761246-761330,761332-761334,761336 \
-761337,761339-761374,761376-761533,761535,761537,761539-761546,761548-761550,761552-7 \
61553,761555-761556,761558-761559,761561,761563-761564,761566-761570,761572,761574-761 \
580,761582-761601,761603-761620,761622-761895,761897-761900,761902-762898,762900-76290 \
4,762906-762907,762910-762921,762923-762988,762990-763015,763017-763023,763025-763037, \
763040-763520,763522-764287,764289-764582,764584-764597,764599,764602-764604,764606-76 \
4610,764612-764617,764619-764627,764629,764631-764670,764672-764679,764681-764682,7646 \
84-764745,764747-764821,764823-764849,764851-764875,764877-764886,764888-764893,764895 \
-765070,765072,765076-765079,765081-765082,765084-765085,765087-765096,765098-765103,7 \
65105-765131,765133-765138,765140,765143,765145-765155,765157-765161,765163-765223,765 \
225,765228-765229,765231-765233,765235,765237-765310,765312-765319,765321-765322,765324-765329,765331-765334,765336-765337,765339-7
  65341,765347,765351,765354-765357,765360-765362,765371,765373-765379,765381,765383,7 \
65385-765577,765579-765693,765695-765736,765738-765739,765742-765745,765747-765749,765 \
751-765753,765757-765760,765762,765764-765765,765767,765769,765773-765774,765777-76577 \
8,765780-765781,765783-765784,765789-765790,765792-765803,765805-765852,765854-765856, \
765858-765874,765876,765878-766054,766056,766058-766085,766087-766088,766091-766093,76 \
6096-766111,766113-766120,766122-766139,766141-766217,766219-766232,766234-766246,7662 \
48-766266,766268-766278,766280-766287,766289-766344,766346-766356,766358-766366,766368 \
-766370,766372-766373,766375-766388,766390-766420,766422-766538,766540-766734,766736-7 \
66749,766751-766768,766770-766774,766776-766780,766782,766784-766789,766791-766831,766 \
833-766834,766836,766838-766898,766900-767026,767028-767029,767031-767040,767042-76704 \
6,767048-767232,767234-767551,767553-767554,767556,767558-767805,767807-767946,767948-767951,767953-768089,768091-768401,768403-768
  683,768685-769139,769141-769318,769320-769322,769324-769354,769356-769705,769707-769 \
924,769926-771105,771107-771207,771209-771251,771253-771697,771699-772302,772304-77230 \
5,772307-772311,772313-772316,772318-773732,773734-774161,774163-775014,775017-775035, \
775037-775040,775042-775194,775196-775202,775204,775207-775211,775213-778001,778003-77 \
8004,778007,778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,7794 \
84-779499,779501-779505,779507-779693,779695-779852,779854-780175,780177-780210,780212 \
-780452,780454-780495,780497,780499-780529,780531-782963,782965-783127,783129-783243,7 \
83245,783248-783477,783479-783566,783568-783846,783848-784380,784383-784691,784693-785 \
053,785055-785315,785318-785478,785480-785562,785564-785569,785571-787387,787389-78782 \
6,787828-788242,788245-788581,788583-788633,788635-791440,791443-793304,793306-793471, \
793473-793538,793540-794733,794735-795763,795765,795767-798444,798447-798448,798450-798495,798497-800070,800072-800167,800169-80044
  0,800442-800614,800616-802138,802140-802148,802150-802151,802153-803256,803258-80325 \
9,803261-803299,803301-803308,803310-803338,803340-803380,803383-803397,803399-804108, \
804110-804615,804617-805460,805701-805702,807761,816314,817071-817101,817103-821345,82 \
1347-821370,821372-821378,821380-821648,821650,821652-823852,823854-824217,824219-8242 \
77,824279-824285,824287-825075,825077-825083,825085-825805,825807-826354,826356-827891 \
,827893-827903,827905-827944,827946-827949,827951-828972,828974-830132,830134-830477,8 \
30479-830549,830551-830875,830877-830932,830934-834241,837624,837626,838287,840224-840 \
649,840651-840684,842115-842659,843189,843750,850540,853423-853426,853428-853431,853433-853494
                
--- branches/kdepim/enterprise4/kdepim/kmail/kmfoldercachedimap.cpp #853984:853985
@@ -324,17 +324,19 @@
     } else {
       configGroup.deleteEntry( "ImapPathCreation" );
     }
-    if ( !mDeletedUIDsSinceLastSync.isEmpty() ) {
-        QList<ulong> uids = mDeletedUIDsSinceLastSync.keys();
-        QStringList uidstrings;
-        for( QList<ulong>::iterator it = uids.begin(); it != uids.end(); it++ ) {
-            uidstrings.append(  QString::number( (*it) ) );
-        }
-        configGroup.writeEntry( "UIDSDeletedSinceLastSync", uidstrings );
+  }
+  if ( !mDeletedUIDsSinceLastSync.isEmpty() ) {
+    QList<ulong> uids = mDeletedUIDsSinceLastSync.keys();
+    QStringList uidstrings;
+    for( QList<ulong>::iterator it = uids.begin(); it != uids.end(); it++ ) {
+      uidstrings.append(  QString::number( (*it) ) );
+    }
+    configGroup.writeEntry( "UIDSDeletedSinceLastSync", uidstrings );
 #if MAIL_LOSS_DEBUGGING
-        kDebug( 5006 ) << "WRITING OUT UIDSDeletedSinceLastSync in: " << folder( \
)->prettyUrl( ) << endl << uidstrings; +    kDebug( 5006 ) << "WRITING OUT \
UIDSDeletedSinceLastSync in: " << folder( )->prettyUrl( ) << endl << uidstrings;  \
                #endif
-    }
+  } else {
+    configGroup.deleteEntry( "UIDSDeletedSinceLastSync" );
   }
   writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig();
   KMFolderMaildir::writeConfig();


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