Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv15796/src/gui
Modified Files:
wxComposeView.cpp
Log Message:
don't refuse to send mail when using local MTA and not SMTP
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.281
retrieving revision 1.282
diff -b -u -2 -r1.281 -r1.282
--- wxComposeView.cpp 26 May 2002 23:02:02 -0000 1.281
+++ wxComposeView.cpp 4 Jun 2002 13:41:15 -0000 1.282
@@ -117,7 +117,9 @@
extern const MOption MP_HOSTNAME;
extern const MOption MP_MSGVIEW_DEFAULT_ENCODING;
+extern const MOption MP_SENDMAILCMD;
extern const MOption MP_SMTPHOST;
extern const MOption MP_USERLEVEL;
extern const MOption MP_USEVCARD;
+extern const MOption MP_USE_SENDMAIL;
extern const MOption MP_VCARD;
@@ -3044,6 +3046,15 @@
while ( !networkSettingsOk )
{
- String host = READ_CONFIG(mApplication->GetProfile(), MP_SMTPHOST);
- if ( host.empty() )
+ // we should have either SMTP host or a sendmail command
+ String hostOrCmd;
+#ifdef OS_UNIX
+ if ( READ_CONFIG(m_Profile, MP_USE_SENDMAIL) )
+ hostOrCmd = READ_CONFIG_TEXT(m_Profile, MP_SENDMAILCMD);
+ else
+#else
+ hostOrCmd = READ_CONFIG_TEXT(m_Profile, MP_SMTPHOST);
+#endif
+
+ if ( hostOrCmd.empty() )
{
if ( MDialog_YesNoDialog(
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
