[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-03-11 17:45:10
Message-ID: 1205257510.903958.29079.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 784549 by vkrause:

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

........
  r784547 | vkrause | 2008-03-11 18:38:06 +0100 (Tue, 11 Mar 2008) | 6 lines
  
  Ensure the current folder is open here. KMFolderMaildir::addMsg() does
  the same and thus destorys the message object we are currently working
  on if the folder hasn't been open before.
  
  Kolab issue 2533 
........


 _M            . (directory)  
 M  +8 -1      kmail/kmfoldercachedimap.cpp  


** branches/KDE/3.5/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-76 \
7946,767948-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-7723 \
16,772318-775194,775196-775202,775204,775207-775211,775213-778001,778003-778004,778007 \
,778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,779484-779505,7 \
79507-779852,779854-779994,782647-783127,783129-783243,783245,783248-783477,783479-783847
  + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767 \
946,767948-769318,769320-769354,769356-771105,771107-771251,771253-772311,772313-77231 \
6,772318-775194,775196-775202,775204,775207-775211,775213-778001,778003-778004,778007, \
778010-778011,778013-778029,778031-778727,778729-779448,779450-779482,779484-779505,77 \
9507-779852,779854-779994,782647-783127,783129-783243,783245,783248-783477,783479-783847,784547
                
--- branches/KDE/3.5/kdepim/kmail/kmfoldercachedimap.cpp #784548:784549
@@ -484,8 +484,15 @@
     uidMapDirty = true;
   }
 
+  KMFolderOpener openThis(folder(), "KMFolderCachedImap::addMsgInternal");
+  int rc = openThis.openResult();
+  if ( rc ) {
+    kdDebug(5006) << k_funcinfo << "open: " << rc << " of folder: " << label() << \
endl; +    return rc;
+  }
+
   // Add the message
-  int rc = KMFolderMaildir::addMsg(msg, index_return);
+  rc = KMFolderMaildir::addMsg(msg, index_return);
 
   if( newMail && ( imapPath() == "/INBOX/" || ( \
!GlobalSettings::self()->filterOnlyDIMAPInbox()  && (userRights() <= 0 || \
userRights() & ACLJobs::Administer )


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