Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.
MERGE: e35, e4
svn path=/trunk/KDE/kdepim/; revision=1004765
Merged revisions 1004635 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1004635 | tmcguire | 2009-07-30 18:48:44 +0200 (Thu, 30 Jul 2009) | 13 lines
Merged revisions 1004609 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1004609 | tmcguire | 2009-07-30 17:45:49 +0200 (Thu, 30 Jul 2009) | 6 lines
Share the object tree in the template parser when doing operations on it.
This removes unnecessary parsing of the object tree, which would lead to multiple passphrase dialogs.
MERGE: e4, trunk
kolab/issue3725
........
................
svn path=/trunk/KDE/kdepim/; revision=1004747
Merged revisions 1001281 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1001281 | winterz | 2009-07-22 21:50:57 +0200 (Wed, 22 Jul 2009) | 13 lines
Merged revisions 1001272 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1001272 | tmcguire | 2009-07-22 15:31:05 -0400 (Wed, 22 Jul 2009) | 5 lines
Parse the mime tree before collecting attachments.
This fixes the problem that forwarding encryped mails did not work as expected.
kolab/issue3725
MERGE: e4,trunk,4.3
........
................
svn path=/trunk/KDE/kdepim/; revision=1004677
settings.
Also move formatString from kmmessage.cpp to stringutil.cpp
Also create TemplatesConfiguration::configIdString function for
obtaining custom template identifier.
BUG: 182911
svn path=/trunk/KDE/kdepim/; revision=1002105
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1001272 | tmcguire | 2009-07-22 15:31:05 -0400 (Wed, 22 Jul 2009) | 5 lines
Parse the mime tree before collecting attachments.
This fixes the problem that forwarding encryped mails did not work as expected.
kolab/issue3725
MERGE: e4,trunk,4.3
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=1001281
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r966821 | tmcguire | 2009-05-12 00:35:10 +0200 (Tue, 12 May 2009) | 8 lines
When inline forwarding a message, include the CCs as well by default.
For this, a new template command OADDRESSEESADDR was added.
Thanks to David "Usability" Faure for suggesting this.
Note to self: When porting to trunk, use "templates.diff" in your KMail dir,
to avoid conflicts.
........
svn path=/trunk/KDE/kdepim/; revision=986306
For this, a new template command OADDRESSEESADDR was added.
Thanks to David "Usability" Faure for suggesting this.
Note to self: When porting to trunk, use "templates.diff" in your KMail dir,
to avoid conflicts.
svn path=/branches/kdepim/enterprise4/kdepim/; revision=966821
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r957591 | tmcguire | 2009-04-22 17:06:42 +0200 (Wed, 22 Apr 2009) | 11 lines
Merged revisions 944433 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r944433 | tmcguire | 2009-03-25 16:02:25 +0100 (Wed, 25 Mar 2009) | 4 lines
Add the ability to use custom To and CC addresses in the forward templates.
Part of kolab/issue3263
........
................
svn path=/trunk/KDE/kdepim/; revision=961582
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r944433 | tmcguire | 2009-03-25 16:02:25 +0100 (Wed, 25 Mar 2009) | 4 lines
Add the ability to use custom To and CC addresses in the forward templates.
Part of kolab/issue3263
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=957591
Tested and seems to still work.
--
Merged revisions 940772,940775,940777,940816 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepim
........
r940772 | tmcguire | 2009-03-18 10:32:23 +0100 (Wed, 18 Mar 2009) | 20 lines
Backport r940441 by tmcguire from trunk to the 4.2 branch:
Don't produce garbage when forwarding a mail with a filter.
For this, I had to remove the code duplication in KMFilterActionForward::process()
and use KMMessage::createForward() instead.
This uncovered a bug in createForward (content type boundary was not saved) and a
small bug in the template parser.
Also, I added a KMMessage::dump() function to help with debugging mimelib
related troubles.
Not perfect yet, the way the template parser copies the message needs to be
improved, right now, when forwarding a signed message, the signed text gets
replaced with the template text, resulting in an invalid signature ...
CCBUG: 174942
........
r940775 | tmcguire | 2009-03-18 10:34:02 +0100 (Wed, 18 Mar 2009) | 11 lines
Backport r940516 by tmcguire from trunk to the 4.2 branch:
When replacing the text of a message after processing the template, don't try
to just replace the first text/plain part, this will cause trouble with signatures
and possibly many other situations.
Instead, delete the content of the old message, and set the processed
template text as the first body part.
If the old message had attachments, re-add them to the new message.
........
r940777 | tmcguire | 2009-03-18 10:36:48 +0100 (Wed, 18 Mar 2009) | 9 lines
Backport r940547 by tmcguire from trunk to the 4.2 branch:
Make valgrind happy.
This didn't find the cause of the problem I was searching for, though
(inline forwarding runs out of memory because allocating insanley huge
amounts of memory)
........
r940816 | tmcguire | 2009-03-18 11:52:19 +0100 (Wed, 18 Mar 2009) | 8 lines
Backport r940565 by tmcguire from trunk to the 4.2 branch:
Don't run out of memory when forwarding a mail with more than one
attachment.
The mimelib behavior here is very irritating...
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=940873
Don't run out of memory when forwarding a mail with more than one
attachment.
The mimelib behavior here is very irritating...
svn path=/branches/KDE/4.2/kdepim/; revision=940816
Make valgrind happy.
This didn't find the cause of the problem I was searching for, though
(inline forwarding runs out of memory because allocating insanley huge
amounts of memory)
svn path=/branches/KDE/4.2/kdepim/; revision=940777
When replacing the text of a message after processing the template, don't try
to just replace the first text/plain part, this will cause trouble with signatures
and possibly many other situations.
Instead, delete the content of the old message, and set the processed
template text as the first body part.
If the old message had attachments, re-add them to the new message.
svn path=/branches/KDE/4.2/kdepim/; revision=940775
Don't produce garbage when forwarding a mail with a filter.
For this, I had to remove the code duplication in KMFilterActionForward::process()
and use KMMessage::createForward() instead.
This uncovered a bug in createForward (content type boundary was not saved) and a
small bug in the template parser.
Also, I added a KMMessage::dump() function to help with debugging mimelib
related troubles.
Not perfect yet, the way the template parser copies the message needs to be
improved, right now, when forwarding a signed message, the signed text gets
replaced with the template text, resulting in an invalid signature ...
CCBUG: 174942
svn path=/branches/KDE/4.2/kdepim/; revision=940772
This didn't find the cause of the problem I was searching for, though
(inline forwarding runs out of memory because allocating insanley huge
amounts of memory)
svn path=/trunk/KDE/kdepim/; revision=940547
to just replace the first text/plain part, this will cause trouble with signatures
and possibly many other situations.
Instead, delete the content of the old message, and set the processed
template text as the first body part.
If the old message had attachments, re-add them to the new message.
svn path=/trunk/KDE/kdepim/; revision=940516
For this, I had to remove the code duplication in KMFilterActionForward::process()
and use KMMessage::createForward() instead.
This uncovered a bug in createForward (content type boundary was not saved) and a
small bug in the template parser.
Also, I added a KMMessage::dump() function to help with debugging mimelib
related troubles.
Not perfect yet, the way the template parser copies the message needs to be
improved, right now, when forwarding a signed message, the signed text gets
replaced with the template text, resulting in an invalid signature ...
BUG: 174942
svn path=/trunk/KDE/kdepim/; revision=940441
Merged revisions 899972,900344 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim
........
r899972 | tmcguire | 2008-12-21 23:53:09 +0100 (Sun, 21 Dec 2008) | 16 lines
Backport r899776 by tmcguire from trunk to the 4.1 branch:
Fix inline-forwarding of messages with attachments.
The template parser copied the original message and then set the whole body to the template text.
This did not work for multipart messages, since setting the body there has no effect (and would
discard the attachment if it had any effect).
Therefore, we simply place the template text in the first text part we find in case of multipart
messages. This probably still breaks with HTML messages with attachments or with other complicated
nested structures. Oh well.
CCBUG: 178128
CCBUG: 146921
kolab/issue 3219
........
r900344 | tmcguire | 2008-12-22 17:20:28 +0100 (Mon, 22 Dec 2008) | 10 lines
Partial backport of 846650 by tmcguire:
- get rid of setBody(), it was not necessary anymore and caused the cursor
to be at the wrong place
=> the effect was that this broke inline forwarding of multipart/mixed messages,
since it set the composer's text to the complete body of the message, which included
MIME headers and the attachment. Now, we rely on the objectreeparser in the composer
to correctly get the text from the message.
........
svn path=/branches/kdepim/enterprise/kdepim/; revision=900587
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim
........
r899972 | tmcguire | 2008-12-21 23:53:09 +0100 (Sun, 21 Dec 2008) | 16 lines
Backport r899776 by tmcguire from trunk to the 4.1 branch:
Fix inline-forwarding of messages with attachments.
The template parser copied the original message and then set the whole body to the template text.
This did not work for multipart messages, since setting the body there has no effect (and would
discard the attachment if it had any effect).
Therefore, we simply place the template text in the first text part we find in case of multipart
messages. This probably still breaks with HTML messages with attachments or with other complicated
nested structures. Oh well.
CCBUG: 178128
CCBUG: 146921
kolab/issue 3219
........
r900344 | tmcguire | 2008-12-22 17:20:28 +0100 (Mon, 22 Dec 2008) | 10 lines
Partial backport of 846650 by tmcguire:
- get rid of setBody(), it was not necessary anymore and caused the cursor
to be at the wrong place
=> the effect was that this broke inline forwarding of multipart/mixed messages,
since it set the composer's text to the complete body of the message, which included
MIME headers and the attachment. Now, we rely on the objectreeparser in the composer
to correctly get the text from the message.
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=900353
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim
........
r899969 | tmcguire | 2008-12-21 23:46:02 +0100 (Sun, 21 Dec 2008) | 6 lines
Backport r898607 by winterz from trunk to the 4.1 branch:
fix crashing in templates when using the %- (dnl) in certain conditions.
CCBUG: 178038
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=900017
The template parser copied the original message and then set the whole body to the template text.
This did not work for multipart messages, since setting the body there has no effect (and would
discard the attachment if it had any effect).
Therefore, we simply place the template text in the first text part we find in case of multipart
messages. This probably still breaks with HTML messages with attachments or with other complicated
nested structures. Oh well.
BUG: 178128
BUG: 146921
svn path=/trunk/KDE/kdepim/; revision=899776
svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r834288 | tmcguire | 2008-07-18 17:15:25 +0200 (Fri, 18 Jul 2008) | 14 lines
Also allow the german leading quote mark ( Unicode character 0x201C ) as a separator
for template quotes.
This fixes replys and forwards being empty when running under German locale.
Thanks to Friedrich Kröner for figuring out that this bug was locale-dependent (no wonder
we developers couldn't reproduce it).
@Translators:
When translating the templates of KMail, please only use U+0022 or U+201C to translate the
quotation mark, otherwise you'll trigger this bug. Simply using the ASCII " character is the
best.
CCMAIL: kde-i18n-doc@kde.org
BUG: 166728
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=835025
Also allow the german leading quote mark ( Unicode character 0x201C ) as a separator
for template quotes.
This fixes replys and forwards being empty when running under German locale.
Thanks to Friedrich Kröner for figuring out that this bug was locale-dependent (no wonder
we developers couldn't reproduce it).
CCBUG: 166728
svn path=/branches/KDE/4.1/kdepim/; revision=834290
for template quotes.
This fixes replys and forwards being empty when running under German locale.
Thanks to Friedrich Kröner for figuring out that this bug was locale-dependent (no wonder
we developers couldn't reproduce it).
@Translators:
When translating the templates of KMail, please only use U+0022 or U+201C to translate the
quotation mark, otherwise you'll trigger this bug. Simply using the ASCII " character is the
best.
CCMAIL: kde-i18n-doc@kde.org
BUG: 166728
svn path=/trunk/KDE/kdepim/; revision=834288
Thomas McGuire
Jonathan Armond
Allen Winter
Volker Krause
Bertjan Broeksema
Frank Osterfeld