[M-CVS] CVS: M/src/mail MailFolderCC.cpp,1.590,1.591 SendMessageCC.cpp,1.170,1.171

[Vadim Z. <va...@us...>]

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

Modified Files:
	MailFolderCC.cpp SendMessageCC.cpp 
Log Message:
added support for building without dialup support (USE_DIALUP) which should 
help building under wxMac


Index: MailFolderCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/MailFolderCC.cpp,v
retrieving revision 1.590
retrieving revision 1.591
diff -b -u -2 -r1.590 -r1.591
--- MailFolderCC.cpp	2001/12/26 02:04:37	1.590
+++ MailFolderCC.cpp	2001/12/28 21:42:48	1.591
@@ -217,6 +217,8 @@
 static class CCEventReflector *gs_CCEventReflector = NULL;
 
+#ifdef USE_DIALUP
 /// object used to close the streams if it can't be done when closing folder
 static class CCStreamCleaner *gs_CCStreamCleaner = NULL;
+#endif // USE_DIALUP
 
 /// handler for temporarily redirected mm_list calls
@@ -349,4 +351,6 @@
 };
 
+#ifdef USE_DIALUP
+
 // ----------------------------------------------------------------------------
 // CCStreamCleaner
@@ -374,4 +378,6 @@
 };
 
+#endif // USE_DIALUP
+
 // ----------------------------------------------------------------------------
 // OverviewData: this class is just used to share parameters between
@@ -1897,4 +1903,5 @@
    bool ok = TRUE;
 
+#ifdef USE_DIALUP
    // check if we need to dial up to open this folder
    if ( mf->NeedsNetwork() && !mApplication->IsOnline() )
@@ -1908,5 +1915,6 @@
       if ( MDialog_YesNoDialog(msg, NULL, MDIALOG_YESNOTITLE,
                                TRUE /* [Yes] default */,
-                               mf->GetName()+"/DialUpOnOpenFolder"))
+                               mf->GetName()+ '/' +
+                               GetPersMsgBoxName(M_MSGBOX_DIALUP_ON_OPEN_FOLDER)))
       {
          mApplication->GoOnline();
@@ -1919,5 +1927,6 @@
                                    NULL, MDIALOG_YESNOTITLE,
                                    FALSE /* [No] default */,
-                                   mf->GetName()+"/NetDownOpenAnyway") )
+                                   mf->GetName() + '/' +
+                                   GetPersMsgBoxName(M_MSGBOX_NET_DOWN_OPEN_ANYWAY)) )
          {
              ok = FALSE;
@@ -1928,4 +1937,5 @@
       }
    }
+#endif // USE_DIALUP
 
    // try to really open it
@@ -2379,5 +2389,13 @@
       CCAllDisabler no;
 
-      if ( !NeedsNetwork() || mApplication->IsOnline() )
+#ifdef USE_DIALUP
+      if ( NeedsNetwork() && !mApplication->IsOnline() )
+      {
+         // a remote folder but we're not connected: delay closing as we can't
+         // do it properly right now
+         gs_CCStreamCleaner->Add(m_MailStream);
+      }
+      else
+#endif // USE_DIALUP
       {
          // it is wrong to do this as it may result in mm_exists() callbacks
@@ -2393,9 +2411,4 @@
          mail_close(m_MailStream);
       }
-      else // a remote folder but we're not connected
-      {
-         // delay closing as we can't do it properly right now
-         gs_CCStreamCleaner->Add(m_MailStream);
-      }
 
       m_MailStream = NIL;
@@ -2813,4 +2826,5 @@
               GetName().c_str());
 
+#ifdef USE_DIALUP
    if ( NeedsNetwork() && ! mApplication->IsOnline() )
    {
@@ -2819,4 +2833,5 @@
       return;
    }
+#endif // USE_DIALUP
 
    MailFolderLocker lock(this);
@@ -2861,4 +2876,5 @@
       }
 
+#ifdef USE_DIALUP
       if ( NeedsNetwork() && !mApplication->IsOnline() &&
            !MDialog_YesNoDialog
@@ -2873,5 +2889,5 @@
             MDIALOG_YESNOTITLE,
             false,
-            GetName()+"/NoNetPingAnyway")
+            GetName() + '/' + GetPersMsgBoxName(M_MSGBOX_NO_NET_PING_ANYWAY))
         )
       {
@@ -2880,4 +2896,5 @@
          return false;
       }
+#endif // USE_DIALUP
 
       // try to reopen the folder if it is closed
@@ -4956,6 +4973,8 @@
    ms_CClientInitialisedFlag = true;
 
+#ifdef USE_DIALUP
    ASSERT(gs_CCStreamCleaner == NULL);
    gs_CCStreamCleaner = new CCStreamCleaner();
+#endif // USE_DIALUP
 
    ASSERT_MSG( !gs_CCEventReflector, "couldn't be created yet" );
@@ -4963,4 +4982,6 @@
 }
 
+#ifdef USE_DIALUP
+
 CCStreamCleaner::~CCStreamCleaner()
 {
@@ -5001,4 +5022,6 @@
 }
 
+#endif // USE_DIALUP
+
 // ----------------------------------------------------------------------------
 // functions used by MailFolder initialization/shutdown code
@@ -5021,4 +5044,5 @@
    free(mail_parameters((MAILSTREAM *)NULL, GET_HOMEDIR, NULL));
 
+#ifdef USE_DIALUP
    if ( gs_CCStreamCleaner )
    {
@@ -5026,4 +5050,5 @@
       gs_CCStreamCleaner = NULL;
    }
+#endif // USE_DIALUP
 
    ASSERT_MSG( MailFolderCC::ms_StreamList.empty(), "some folder objects leaked" );

Index: SendMessageCC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/mail/SendMessageCC.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -b -u -2 -r1.170 -r1.171
--- SendMessageCC.cpp	2001/12/26 14:38:58	1.170
+++ SendMessageCC.cpp	2001/12/28 21:42:48	1.171
@@ -1117,4 +1117,5 @@
    bool send = sendNow || m_OutboxName.empty();
 
+#ifdef USE_DIALUP
    if ( send && !mApplication->IsOnline() )
    {
@@ -1144,4 +1145,5 @@
       }
    }
+#endif // USE_DIALUP
 
    // prepare the message for sending or queuing