Update of /cvsroot/mahogany/M/src/classes
In directory usw-pr-cvs1:/tmp/cvs-serv20744/src/classes
Modified Files:
ComposeTemplate.cpp
Log Message:
fixed the bug with always quoting the message, even when the user chose not
to do it by adding special MailFolder::Params::NO_QUOTE value
also made Params::msgview const (and propagated constness elsewhere)
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- ComposeTemplate.cpp 11 Jun 2002 23:58:40 -0000 1.33
+++ ComposeTemplate.cpp 28 Jun 2002 00:43:55 -0000 1.34
@@ -273,5 +273,5 @@
Profile *profile = NULL,
Message *msg = NULL,
- MessageView *msgview = NULL)
+ const MessageView *msgview = NULL)
: m_sink(sink), m_cv(cv)
{
@@ -368,5 +368,5 @@
// the message viewer we use for querying the selection if necessary
- MessageView *m_msgview;
+ const MessageView *m_msgview;
// the profile to use for everything (global one by default)
@@ -1099,4 +1099,10 @@
if ( name == "text" || name == "quote" )
{
+ if ( m_msgview == MailFolder::Params::NO_QUOTE )
+ {
+ // we don't want to quote anything at all
+ break;
+ }
+
// insert the original text (optionally prefixed by reply
// string)
@@ -1642,5 +1648,5 @@
const String& templateValue,
Message *msg,
- MessageView *msgview)
+ const MessageView *msgview)
{
ExpansionSink sink;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Bringing you mounds of caffeinated joy.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
