Update of /cvsroot/mahogany/M/src/classes
In directory usw-pr-cvs1:/tmp/cvs-serv2426/src/classes
Modified Files:
ComposeTemplate.cpp
Log Message:
fixed handling of $sender broken by last commit
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -u -2 -r1.24 -r1.25
--- ComposeTemplate.cpp 4 Mar 2002 18:24:35 -0000 1.24
+++ ComposeTemplate.cpp 4 Mar 2002 18:58:24 -0000 1.25
@@ -216,4 +216,5 @@
OriginalHeader_ReplyTo,
OriginalHeader_Newsgroups,
+ OriginalHeader_Domain,
OriginalHeader_Invalid,
OriginalHeader_Max = OriginalHeader_Invalid
@@ -591,4 +592,5 @@
"replyto",
"newsgroups",
+ "domain",
};
@@ -732,7 +734,9 @@
case MiscVar_Quote822:
case MiscVar_Text:
- case MiscVar_Sender:
return ExpandOriginal(name, value);
+ case MiscVar_Sender:
+ return ExpandOriginal("from", value);
+
case MiscVar_Signature:
*value = GetSignature();
@@ -987,4 +991,15 @@
break;
+ case OriginalHeader_Domain:
+ {
+ AddressList_obj addrList(m_msg->From());
+ Address *addr = addrList->GetFirst();
+ if ( addr )
+ {
+ *value = addr->GetDomain();
+ }
+ }
+ break;
+
default:
isHeader = false;
@@ -1172,11 +1187,8 @@
if ( hasSign )
{
- // the signature must be on its own line(s)
- signature = '\n';
-
// insert separator optionally
if ( READ_CONFIG(m_profile, MP_COMPOSE_USE_SIGNATURE_SEPARATOR) )
{
- signature += "--\n";
+ signature += "\n--";
}
@@ -1185,5 +1197,5 @@
for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
{
- signature << fileSig[nLine] << '\n';
+ signature << '\n' << fileSig[nLine];
}
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
