Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv20744/src/gui
Modified Files:
wxComposeView.cpp wxMsgCmdProc.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: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.284
retrieving revision 1.285
diff -b -u -2 -r1.284 -r1.285
--- wxComposeView.cpp 11 Jun 2002 20:22:27 -0000 1.284
+++ wxComposeView.cpp 28 Jun 2002 00:43:55 -0000 1.285
@@ -1957,5 +1957,5 @@
void
-wxComposeView::InitText(Message *msg, MessageView *msgview)
+wxComposeView::InitText(Message *msg, const MessageView *msgview)
{
if ( m_kind == Message_New )
@@ -2024,5 +2024,5 @@
void
-wxComposeView::DoInitText(Message *mailmsg, MessageView *msgview)
+wxComposeView::DoInitText(Message *mailmsg, const MessageView *msgview)
{
// position the cursor correctly and separate us from the previous message
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -u -2 -r1.24 -r1.25
--- wxMsgCmdProc.cpp 20 Jun 2002 18:12:32 -0000 1.24
+++ wxMsgCmdProc.cpp 28 Jun 2002 00:43:55 -0000 1.25
@@ -728,15 +728,4 @@
}
- // disable the template if we don't want to quote the original
- // message
- if ( quote == M_ACTION_NEVER )
- {
- // FIXME: this is just a quick and dirty hack, what we really
- // need is a way to pass an extra flag to ReplyMessages()
- // below, but simply doing this should work in most cases
- templ.Replace("$QUOTE", "");
- templ.Replace("$quote", "");
- }
-
#define CASE_REPLY(kind) \
case WXMENU_MSG_##kind: \
@@ -760,5 +749,7 @@
MailFolder::Params params(templ, replyKind);
- params.msgview = m_msgView;
+ params.msgview =
+ quote == M_ACTION_NEVER ? MailFolder::Params::NO_QUOTE
+ : m_msgView;
m_TicketList->Add(m_asmf->ReplyMessages
-------------------------------------------------------
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
