Update of /cvsroot/mahogany/M/src/classes
In directory usw-pr-cvs1:/tmp/cvs-serv16317/src/classes
Modified Files:
ComposeTemplate.cpp
Log Message:
don't cut off the sig when it is in selected text
Index: ComposeTemplate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ComposeTemplate.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -u -2 -r1.32 -r1.33
--- ComposeTemplate.cpp 13 May 2002 00:27:39 -0000 1.32
+++ ComposeTemplate.cpp 11 Jun 2002 23:58:40 -0000 1.33
@@ -336,7 +336,13 @@
// put the text quoted according to our current quoting options with the
// given reply prefix into value
+ enum
+ {
+ NoDetectSig = 0,
+ DetectSig = 1
+ };
void ExpandOriginalText(const String& text,
const String& prefix,
- String *value) const;
+ String *value,
+ int flags = DetectSig) const;
private:
@@ -1126,5 +1132,5 @@
{
// include the selection only in the template expansion
- ExpandOriginalText(selection, prefix, value);
+ ExpandOriginalText(selection, prefix, value, NoDetectSig);
}
}
@@ -1392,7 +1398,9 @@
}
-void VarExpander::ExpandOriginalText(const String& text,
+void
+VarExpander::ExpandOriginalText(const String& text,
const String& prefix,
- String *value) const
+ String *value,
+ int flags) const
{
// should we quote the empty lines?
@@ -1426,5 +1434,6 @@
// should we detect the signature and discard it?
- bool detectSig = READ_CONFIG_BOOL(m_profile, MP_REPLY_DETECT_SIG);
+ bool detectSig = (flags & DetectSig) &&
+ READ_CONFIG_BOOL(m_profile, MP_REPLY_DETECT_SIG);
#if wxUSE_REGEX
_______________________________________________________________
Multimillion Dollar Computer Inventory
Live Webcast Auctions Thru Aug. 2002 - http://www.cowanalexander.com/calendar
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
