[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-08-18 17:53:56
Message-ID: 1219082036.622392.28675.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 848912 by vkrause:

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

........
  r842115 | vkrause | 2008-08-04 20:31:32 +0200 (Mon, 04 Aug 2008) | 5 lines
  
  Don't rewrite a just deleted folder configuration. This fixes recreation
  of a just deleted folder.
  
  Kolab issue 2933
........
  r842659 | vkrause | 2008-08-05 20:13:00 +0200 (Tue, 05 Aug 2008) | 7 lines
  
  Don't try to delete the job again if the error handling code already
  killed all of them. Fixes a crash when copying a message into a
  read-only folder before we know it actually is read-only and selecting
  cancel in the subsequent error dialog.
  
  Kolab issue 2850
........


 _M            . (directory)  
 M  +2 -2      kmail/imapjob.cpp  
 M  +5 -0      kmail/kmfoldercachedimap.cpp  


** 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,788634,78 \
9925,790349-790352,791184-791440,791443-792201,792203-792957,793296,794734,795745-795763,795765, \
795767-798445,798447-798448,798450-798495,798497-800070,800072-800167,800169-802138,802140-80214 \
8,802150-802151,802153-803259,803261-803299,803301-803308,803310-803380,803383-803397,803399-804 \
993,804995-805347,805349-805427,805429-805459,805461-805702,807761-809708,809710-810236,810238-810302,810304,810306-811205,811
  207-813547,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324-817070,817072 \
-817087,817089-817101,817103-819076,819078-821035,821037-821124,821126-821378,821380-821648,8216 \
50-822268,822270-824277,824279-825075,825077-825083,825085-826354,826356-827612,827614-827891,82 \
7893-827944,827946-827949,827951-829033,829035-830477,830479-830875,830877-830932,830934-836103,836105-836275,836278-836391,836393-836428,836430-837231,837233-837624
  + /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,788634,789 \
925,790349-790352,791184-791440,791443-792201,792203-792957,793296,794734,795745-795763,795765,7 \
95767-798445,798447-798448,798450-798495,798497-800070,800072-800167,800169-802138,802140-802148 \
,802150-802151,802153-803259,803261-803299,803301-803308,803310-803380,803383-803397,803399-8049 \
93,804995-805347,805349-805427,805429-805459,805461-805702,807761-809708,809710-810236,810238-810302,810304,810306-811205,811
  207-813547,813549-814372,814374,814376-816024,816026-816313,816315-816322,816324-817070,817072 \
-817087,817089-817101,817103-819076,819078-821035,821037-821124,821126-821378,821380-821648,8216 \
50-822268,822270-824277,824279-825075,825077-825083,825085-826354,826356-827612,827614-827891,82 \
7893-827944,827946-827949,827951-829033,829035-830477,830479-830875,830877-830932,830934-836103, \
                836105-836275,836278-836391,836393-836428,836430-837231,837233-837624,842115-842659
                
--- branches/KDE/3.5/kdepim/kmail/imapjob.cpp #848911:848912
@@ -650,8 +650,8 @@
     QString errStr = i18n("Error while copying messages.");
     if ( (*it).progressItem )
       (*it).progressItem->setStatus( errStr );
-    account->handleJobError( job, errStr  );
-    deleteLater();
+    if ( account->handleJobError( job, errStr  ) )
+      deleteLater();
     return;
   } else {
     if ( !(*it).msgList.isEmpty() )
--- branches/KDE/3.5/kdepim/kmail/kmfoldercachedimap.cpp #848911:848912
@@ -301,6 +301,11 @@
 
 void KMFolderCachedImap::writeConfig()
 {
+  // don't re-write the config of a removed folder, this has just been deleted in
+  // the folder manager
+  if ( mFolderRemoved )
+    return;
+
   KConfigGroup configGroup( KMKernel::config(), "Folder-" + folder()->idString() );
   configGroup.writeEntry( "ImapPath", mImapPath );
   configGroup.writeEntry( "NoContent", mNoContent );


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