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

List:       kde-commits
Subject:    kdepim/kmail
From:       Carsten Burghardt <burghardt () kde ! org>
Date:       2005-03-31 20:37:53
Message-ID: 20050331203753.6B3BE638 () office ! kde ! org
[Download RAW message or body]

CVS commit by burghard: 

Fix attachment issues.
BUGS:102766
BUGS:102663


  M +6 -5      folderstorage.cpp   1.49
  M +5 -0      kmfoldermaildir.cpp   1.101
  M +4 -0      kmfoldermbox.cpp   1.114


--- kdepim/kmail/kmfoldermaildir.cpp  #1.100:1.101
@@ -470,4 +470,8 @@ if( fileD0.open( IO_WriteOnly ) ) {
   ++mTotalMsgs;
 
+  if ( aMsg->attachmentState() == KMMsgAttachmentUnknown && 
+       aMsg->readyToShow() )
+    aMsg->updateAttachmentState();
+  
   // store information about the position in the folder file in the message
   aMsg->setParent(folder());
@@ -546,4 +550,5 @@ KMMessage* KMFolderMaildir::readMsg(int 
   KMMessage *msg = new KMMessage(*mi); // note that mi is deleted by the line below
   mMsgList.set(idx,&msg->toMsgBase()); // done now so that the serial number can be computed
+  msg->setComplete( true );
   msg->fromDwString(getDwString(idx));
   return msg;

--- kdepim/kmail/kmfoldermbox.cpp  #1.113:1.114
@@ -1079,4 +1079,8 @@ if( fileD1.open( IO_WriteOnly ) ) {
   ++mTotalMsgs;
 
+  if ( aMsg->attachmentState() == KMMsgAttachmentUnknown && 
+       aMsg->readyToShow() )
+    aMsg->updateAttachmentState();
+  
   // store information about the position in the folder file in the message
   aMsg->setParent(folder());

--- kdepim/kmail/folderstorage.cpp  #1.48:1.49
@@ -471,12 +471,13 @@ KMMessage* FolderStorage::readTemporaryM
     msg = new KMMessage(*(KMMessage*)mb);
     msg->setMsgSerNum(sernum);
+    msg->setComplete( true );
   } else {
     // ## Those two lines need to be moved to a virtual method for KMFolderSearch, like readMsg
     msg = new KMMessage(*(KMMsgInfo*)mb);
     msg->setMsgSerNum(sernum); // before fromDwString so that readyToShow uses the right sernum
+    msg->setComplete( true );
     msg->fromDwString(getDwString(idx));
   }
   msg->setEnableUndo(undo);
-  msg->setComplete( true );
   return msg;
 }


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