Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv4382/src/classes
Modified Files:
Moptions.cpp ComposeTemplate.cpp
Log Message:
honour X-Attribution when replying (bug 773)
Index: Moptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Moptions.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -b -u -2 -r1.63 -r1.64
--- Moptions.cpp 18 Sep 2003 16:30:50 -0000 1.63
+++ Moptions.cpp 22 Sep 2003 23:49:42 -0000 1.64
@@ -275,4 +275,5 @@
const MOption MP_REPLY_QUOTE_SELECTION;
const MOption MP_REPLY_MSGPREFIX;
+const MOption MP_REPLY_MSGPREFIX_FROM_XATTR;
const MOption MP_REPLY_MSGPREFIX_FROM_SENDER;
const MOption MP_REPLY_QUOTE_EMPTY;
@@ -677,4 +678,5 @@
DEFINE_OPTION(MP_REPLY_QUOTE_SELECTION),
DEFINE_OPTION(MP_REPLY_MSGPREFIX),
+ DEFINE_OPTION(MP_REPLY_MSGPREFIX_FROM_XATTR),
DEFINE_OPTION(MP_REPLY_MSGPREFIX_FROM_SENDER),
DEFINE_OPTION(MP_REPLY_QUOTE_EMPTY),
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -u -2 -r1.51 -r1.52
--- ComposeTemplate.cpp 19 Sep 2003 13:31:20 -0000 1.51
+++ ComposeTemplate.cpp 22 Sep 2003 23:49:43 -0000 1.52
@@ -68,4 +68,5 @@
extern const MOption MP_REPLY_DETECT_SIG;
extern const MOption MP_REPLY_MSGPREFIX;
+extern const MOption MP_REPLY_MSGPREFIX_FROM_XATTR;
extern const MOption MP_REPLY_MSGPREFIX_FROM_SENDER;
extern const MOption MP_REPLY_QUOTE_EMPTY;
@@ -1395,7 +1396,14 @@
String prefix;
+ // X-Attribution header value overrides everything else if it exists
+ if ( m_msg && READ_CONFIG_BOOL(m_profile, MP_REPLY_MSGPREFIX_FROM_XATTR) )
+ {
+ m_msg->GetHeaderLine("X-Attribution", prefix);
+ }
+
// prepend the senders initials to the reply prefix (this
// will make reply prefix like "VZ>")
- if ( READ_CONFIG(m_profile, MP_REPLY_MSGPREFIX_FROM_SENDER) )
+ if ( prefix.empty() &&
+ READ_CONFIG(m_profile, MP_REPLY_MSGPREFIX_FROM_SENDER) )
{
// take from address, not reply-to which can be set to
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
