Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12588/src/gui

Modified Files:
        wxComposeView.cpp wxMsgCmdProc.cpp 
Log Message:
when replying to PGP-encrypted messages we now use plain text (coming from the
viewer) instead of the encrypted text; for this:

1. added MessageView::OnBodyText() to accumulate the text shown in the viewer
2. added ViewFilter::Start/EndText() and ProcessURL() and overrode them in
   TransparentFilter to call OnBodyText()
3. modified the view filters to use the functions above instead of using
   MessageViewer methods directly
4. removed NO_QUOTE hack from MailFolder, now we don't quote anything simply
   if the msgview is NULL


Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.365
retrieving revision 1.366
diff -b -u -2 -r1.365 -r1.366
--- wxComposeView.cpp   9 Jul 2004 10:50:34 -0000       1.365
+++ wxComposeView.cpp   12 Jul 2004 20:53:20 -0000      1.366
@@ -2657,5 +2657,5 @@
       }
 
-      if ( m_msgviewOrig == MailFolder::Params::NO_QUOTE )
+      if ( !m_msgviewOrig )
       {
          // we don't want to quote anything at all, so remove all occurences of

Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -b -u -2 -r1.60 -r1.61
--- wxMsgCmdProc.cpp    11 Jul 2004 22:51:50 -0000      1.60
+++ wxMsgCmdProc.cpp    12 Jul 2004 20:53:21 -0000      1.61
@@ -789,7 +789,5 @@
 
             MailFolder::Params params(templ, replyKind);
-            params.msgview =
-               quote == M_ACTION_NEVER ? MailFolder::Params::NO_QUOTE
-                                       : m_msgView;
+            params.msgview = quote == M_ACTION_NEVER ? NULL : m_msgView;
 
             m_TicketList->Add(m_asmf->ReplyMessages



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to