Update of /cvsroot/mahogany/M/src/mail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21211/src/mail
Modified Files:
MailFolderCC.cpp
Log Message:
fixed problem with trying to update the GUI state of an already expunged message (this
bug was probably harmless, other more serious one(s?) must still be lurking
somewhere...)
Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.694
retrieving revision 1.695
diff -b -u -2 -r1.694 -r1.695
--- MailFolderCC.cpp 2 Jan 2004 22:53:02 -0000 1.694
+++ MailFolderCC.cpp 7 Apr 2004 22:56:11 -0000 1.695
@@ -4128,6 +4128,9 @@
// Copy the tree given to us to some 'known' memory
//
-static THREADNODE* CopyTree(THREADNODE* th) {
- if (th == NULL) return NULL;
+static THREADNODE *CopyTree(THREADNODE* th)
+{
+ if ( !th )
+ return NULL;
+
THREADNODE* thrNode = new THREADNODE;
thrNode->num = th->num;
@@ -4188,5 +4191,7 @@
GetName().c_str());
- THREADNODE *thrRoot = mail_thread
+ ASSERT_MSG( !thrData->m_root, _T("will leak THREADNODE tree!") );
+
+ thrData->m_root = mail_thread
(
m_MailStream,
@@ -4197,18 +4202,12 @@
);
- if ( thrRoot )
+ if ( thrData->m_root )
{
- // We copy the tree so that we can release the c-client
- // memory right now. After that, we know that whatever
- // the algo that was used, we can destroy the tree the
- // same way.
- thrData->m_root = CopyTree(thrRoot);
-
- mail_free_threadnode(&thrRoot);
-
// everything done
return true;
}
- else if ( IsOpened() )
+
+ // failed to thread, why?
+ if ( IsOpened() )
{
// it was really an error with threading, how strange
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
