Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv23859/src/gui
Modified Files:
wxOptionsDlg.cpp
Log Message:
do allow setting SMTP server and its parameters for each folder individually
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.324
retrieving revision 1.325
diff -b -u -2 -r1.324 -r1.325
--- wxOptionsDlg.cpp 18 Mar 2002 14:20:06 -0000 1.324
+++ wxOptionsDlg.cpp 28 Mar 2002 21:07:03 -0000 1.325
@@ -860,8 +860,8 @@
{ gettext_noop("&IMAP server"), Field_Text | Field_AppWide, -1,
},
#ifdef USE_SENDMAIL
- { gettext_noop("Use local mail transfer a&gent"), Field_Bool | Field_AppWide, -1,
},
- { gettext_noop("Local MTA &command"), Field_Text | Field_AppWide,
ConfigField_UseSendmail },
+ { gettext_noop("Use local mail transfer a&gent"), Field_Bool, -1, },
+ { gettext_noop("Local MTA &command"), Field_Text, ConfigField_UseSendmail },
#endif // USE_SENDMAIL
- { gettext_noop("SMTP (&mail) server"), Field_Text | Field_AppWide |
Field_Vital,
+ { gettext_noop("SMTP (&mail) server"), Field_Text | Field_Vital,
#ifdef USE_SENDMAIL
-ConfigField_UseSendmail,
@@ -870,5 +870,5 @@
#endif
},
- { gettext_noop("NNTP (&news) server"), Field_Text | Field_AppWide, -1,
},
+ { gettext_noop("NNTP (&news) server"), Field_Text, -1, },
{ gettext_noop("If your SMTP server supports 8BITMIME ESMTP extension\n"
@@ -877,5 +877,4 @@
"properly, so there is normally no risk in setting this "
"option."), Field_Message |
- Field_AppWide |
Field_Advanced,
#ifdef USE_SENDMAIL
@@ -886,5 +885,4 @@
},
{ gettext_noop("Send &8 bit data"), Field_Bool |
- Field_AppWide |
Field_Advanced,
#ifdef USE_SENDMAIL
@@ -902,5 +900,5 @@
"problems if specified when it is not needed."),
Field_Message | Field_AppWide, -1, },
- { gettext_noop("SMTP server &user ID"), Field_Text | Field_AppWide,
+ { gettext_noop("SMTP server &user ID"), Field_Text,
#ifdef USE_SENDMAIL
-ConfigField_UseSendmail,
@@ -909,10 +907,10 @@
#endif
},
- { gettext_noop("SMTP server pa&ssword"), Field_Passwd | Field_AppWide,
ConfigField_MailServerLogin, },
- { gettext_noop("NNTP server user &ID"), Field_Text | Field_AppWide, -1,
},
- { gettext_noop("NNTP server pass&word"), Field_Passwd | Field_AppWide,
ConfigField_NewsServerLogin, },
+ { gettext_noop("SMTP server pa&ssword"), Field_Passwd,
+ConfigField_MailServerLogin, },
+ { gettext_noop("NNTP server user &ID"), Field_Text, -1, },
+ { gettext_noop("NNTP server pass&word"), Field_Passwd,
+ConfigField_NewsServerLogin, },
- { gettext_noop("Try to guess SMTP sender header"), Field_Bool | Field_AppWide |
Field_Advanced, ConfigField_MailServerLogin, },
- { gettext_noop("SMTP sender header"), Field_Text | Field_AppWide | Field_Advanced,
-ConfigField_GuessSender, },
+ { gettext_noop("Try to guess SMTP sender header"), Field_Bool | Field_Advanced,
+ConfigField_MailServerLogin, },
+ { gettext_noop("SMTP sender header"), Field_Text | Field_Advanced,
+-ConfigField_GuessSender, },
#ifdef USE_SSL
{ gettext_noop("Mahogany can attempt to use SSL (secure sockets layer) to send\n"
@@ -920,6 +918,6 @@
"You may also have to tell Mahogany to accept unsigned (or\n"
"self-signed) certificates if your organization uses them."),
- Field_Message | Field_AppWide, -1
},
- { gettext_noop("SMTP server uses SS&L"), Field_Bool | Field_AppWide,
+ Field_Message, -1 },
+ { gettext_noop("SMTP server uses SS&L"), Field_Bool,
#ifdef USE_SENDMAIL
-ConfigField_UseSendmail,
@@ -928,7 +926,7 @@
#endif
},
- { gettext_noop("&Accept unsigned certificates for SMTP"), Field_Bool |
Field_AppWide, ConfigField_SmtpServerSSL, },
- { gettext_noop("NNTP s&erver uses SSL"), Field_Bool | Field_AppWide, -1,
},
- { gettext_noop("A&ccept unsigned certificates for NNTP"), Field_Bool |
Field_AppWide, ConfigField_NntpServerSSL, },
+ { gettext_noop("&Accept unsigned certificates for SMTP"), Field_Bool,
+ConfigField_SmtpServerSSL, },
+ { gettext_noop("NNTP s&erver uses SSL"), Field_Bool, -1,
+},
+ { gettext_noop("A&ccept unsigned certificates for NNTP"), Field_Bool,
+ConfigField_NntpServerSSL, },
#endif // USE_SSL
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
