===================================================================
--- kpimidentities/identity.h (revision 737189)
+++ kpimidentities/identity.h (working copy)
@@ -181,13 +181,21 @@
void setSignature( const Signature &sig );
Signature &signature(); /* _not_ const! */
- /** Returns the signature. This method also takes care of special
- signature files that are shell scripts and handles them
- correct. So use this method to rectreive the contents of the
- signature file. If @p prompt is false, no errors will be displayed
- (useful for retries). */
- QString signatureText( bool *ok=0 ) const;
+ /** @return the signature with '-- \n' prepended to it if it is not
+ present already.
+ If @p ok is a valid bool pointer, @p ok is set to true or false depending
+ on wether the signature could successfully be obtained.
+ */
+ QString signatureText( bool *ok = 0 ) const;
+ /** @return the signature.
+ If @p addSeparator is true, '-- \n' is prepended if this is not
+ already in the signature itself.
+ If @p ok is a valid bool pointer, @p ok is set to true or false depending
+ on wether the signature could successfully be obtained.
+ QString signatureText( bool *ok, bool addSeparator ) const;
+
/** The transport that is set for this identity. Used to link a
transport with an identity. */
QString transport() const;
Index: kpimidentities/signature.h
===================================================================
--- kpimidentities/signature.h (revision 737189)
+++ kpimidentities/signature.h (working copy)
@@ -79,8 +79,8 @@
/** @return the raw signature text as entered resp. read from file. */
QString rawText( bool *ok=0 ) const;
- /** @return the signature text with a "-- " separator added, if
- necessary. */
+ /** @return the signature text with a "-- \n" separator added, if
+ necessary. A newline will not be appended or prepended. */
QString withSeparator( bool *ok=0 ) const;
/** Set the signature text and mark this signature as being of