Update of /cvsroot/mahogany/M/src/mail
In directory usw-pr-cvs1:/tmp/cvs-serv17970/src/mail

Modified Files:
        MailFolderCmn.cpp 
Log Message:
reenabled folder keep open code, it doesn't seem to conflict with the new additions

Index: MailFolderCmn.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCmn.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -b -u -2 -r1.87 -r1.88
--- MailFolderCmn.cpp   27 Apr 2002 20:58:11 -0000      1.87
+++ MailFolderCmn.cpp   27 Apr 2002 21:47:43 -0000      1.88
@@ -341,8 +341,8 @@
         : m_timer(this)
 {
+   // default timer interval, will be updated in Add() if needed
    m_interval = READ_APPCONFIG(MP_FOLDER_CLOSE_DELAY);
 
-   // start it, in fact
-   RestartTimer();
+   // don't start the timer for now, we don't have any folders to close yet
 }
 
@@ -377,5 +377,5 @@
    {
       // restart the timer using smaller interval - of course, normally we
-      // should compute the pgcd of all intervals but let's keep it simple
+      // should compute the gcd of all intervals but let's keep it simple
       m_interval = delay;
 
@@ -402,8 +402,4 @@
       }
    }
-
-   // FIXME: this is just a temp hack
-   extern void CheckConnectionsTimeout();
-   CheckConnectionsTimeout();
 }
 
@@ -439,5 +435,5 @@
       if ( i->Matches(mf) )
       {
-         return i.operator->();
+         return *i;
       }
    }
@@ -484,7 +480,4 @@
 MailFolderCmn::DecRef()
 {
-   // FIXME: revise this code taking into account connection caching we now do
-   //        in MailFolderCC, it can't work without changes probably
-#if 0
    // don't keep folders alive artificially if we're going to terminate soon
    // anyhow - or if we didn't start up fully yet and gs_MailFolderCloser
@@ -528,5 +521,4 @@
       }
    }
-#endif // 0
 
    return RealDecRef();


_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to