Authored by vkrause on Dec 29 2009, 2:44 PM.

Description

SVN_MERGE

Merged revisions 1065913,1065939,1066123,1066128-1066129,1066131,1066158,1066349,1066358,1066360,1066375,1066378,1066585,1066588-1066589,1066604,1066611,1066806-1066807,1066905,1066936,1066941-1066942,1067280,1067336,1067339,1067378 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........

r1065913 | winterz | 2009-12-24 20:34:31 +0100 (Thu, 24 Dec 2009) | 4 lines

updated, from Juliano
BUG: 219758
MERGE: 4.3

........

r1065939 | winterz | 2009-12-25 00:09:48 +0100 (Fri, 25 Dec 2009) | 3 lines

minor coding style fixes
SVN_SILENT:

........

r1066123 | tmcguire | 2009-12-26 00:13:43 +0100 (Sat, 26 Dec 2009) | 2 lines

Print the actual input instead of "aStr"

........

r1066128 | tmcguire | 2009-12-26 00:29:26 +0100 (Sat, 26 Dec 2009) | 1 line

Port to qtestlib.

........

r1066129 | tmcguire | 2009-12-26 00:31:21 +0100 (Sat, 26 Dec 2009) | 1 line

Simplify

........

r1066131 | tmcguire | 2009-12-26 00:39:13 +0100 (Sat, 26 Dec 2009) | 1 line

Simplifiy

........

r1066158 | ahartmetz | 2009-12-26 07:01:16 +0100 (Sat, 26 Dec 2009) | 1 line

link with gold

........

r1066349 | tmcguire | 2009-12-26 21:08:57 +0100 (Sat, 26 Dec 2009) | 1 line

SVN_SILENT typo

........

r1066358 | tmcguire | 2009-12-26 22:56:21 +0100 (Sat, 26 Dec 2009) | 13 lines

I admit defeat: Disable the test.

I found no way to fix the test. The problem was that the test manually included ../kmime_headerfactory.cpp, which
was already included by linking to kmime. However, that cpp file had non-exported private symbols, which
is the reason it was included manually again.

Including the same compilation unit twice introduces interesting problems though, such as two instances of 
the same K_GLOBAL_STATIC being created, which caused the tests to fail.

So there is no sane way I found to test private functions. But maybe private functions ought not to be tested.

Anybody an idea how to make the test work again?

........

r1066360 | tmcguire | 2009-12-26 23:00:21 +0100 (Sat, 26 Dec 2009) | 12 lines

Prevent spoofing of the From address by using Unicode direction control chars
in the display name.

Make sure to balance the Bidi control characters so that the direction changes
can not flow over to the addrspec.

We balance the characters when parsing the mailbox or addresslist.

Add some tests for that.

Note that this only fixes KMime-based clients, a fix for KMail will follow soon.

........

r1066375 | tmcguire | 2009-12-26 23:50:29 +0100 (Sat, 26 Dec 2009) | 5 lines

Grmbl, KHTML seems to ignore the PDF char, so all my work was moot...

Instead of balancing the bidi control characters, simply remove them now,
that works even with KHTML.

........

r1066378 | tmcguire | 2009-12-26 23:52:01 +0100 (Sat, 26 Dec 2009) | 4 lines

Remove bidi control characters here as well.

Not strictly necessary when using KMime, but KMail doesn't use KMime.

........

r1066585 | tmcguire | 2009-12-27 15:10:05 +0100 (Sun, 27 Dec 2009) | 5 lines

Disable these annoying qdebugs.

Since there is no KDE dependency here, we can't use kDebug which would have the ability to
turn them off.

........

r1066588 | tmcguire | 2009-12-27 15:16:59 +0100 (Sun, 27 Dec 2009) | 5 lines

Comment out debug output with std::cerr, which is annoying since it
can't be turned off.

If you want debug output, use kDebug.

........

r1066589 | tmcguire | 2009-12-27 15:17:46 +0100 (Sun, 27 Dec 2009) | 2 lines

Fix warning about unused function.

........

r1066604 | djarvie | 2009-12-27 15:48:07 +0100 (Sun, 27 Dec 2009) | 2 lines

apidox corrections

........

r1066611 | djarvie | 2009-12-27 15:53:06 +0100 (Sun, 27 Dec 2009) | 2 lines

Add info supplied by Volker

........

r1066806 | djarvie | 2009-12-28 00:03:52 +0100 (Mon, 28 Dec 2009) | 2 lines

Change apidox references to MimeTypeFilterProxyModel -> EntityMimeTypeFilterModel.

........

r1066807 | djarvie | 2009-12-28 00:06:13 +0100 (Mon, 28 Dec 2009) | 2 lines

Revert unintentional change to entityData()

........

r1066905 | scripty | 2009-12-28 11:29:17 +0100 (Mon, 28 Dec 2009) | 1 line

SVN_SILENT made messages (.desktop file)

........

r1066936 | cgiboudeaux | 2009-12-28 12:57:27 +0100 (Mon, 28 Dec 2009) | 1 line

SVN_SILENT remove an old comment.

........

r1066941 | tokoe | 2009-12-28 13:17:57 +0100 (Mon, 28 Dec 2009) | 2 lines

Hide private API

........

r1066942 | tokoe | 2009-12-28 13:31:51 +0100 (Mon, 28 Dec 2009) | 3 lines

Replace our QSharedDataPointer::detach() hack with the
proper solution that is available since Qt 4.5

........

r1067280 | tmcguire | 2009-12-29 12:17:33 +0100 (Tue, 29 Dec 2009) | 1 line

Add comment for API change in KDE5.

........

r1067336 | tmcguire | 2009-12-29 12:59:48 +0100 (Tue, 29 Dec 2009) | 1 line

When no charset is given, use the name of the codec, instead of none.

........

r1067339 | tmcguire | 2009-12-29 13:00:53 +0100 (Tue, 29 Dec 2009) | 4 lines

Add a test for UTF16 mails.
While UTF16 works fine, this uncovered the bug fixed with the previous commit
(no charset in RFC2047-string) and also a not yet fixed newline bug.

........

r1067378 | tmcguire | 2009-12-29 13:54:55 +0100 (Tue, 29 Dec 2009) | 3 lines

Fix removing trailing newlines in decodedText() when not trimming other whitespace.
Add a quick test.

........

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1067401

Merged Changes

CommitAuthorDetailsCommitted
0495f36aff27djarvie
Add info supplied by Volker 
Dec 27 2009
3623a0718e25djarvie
apidox corrections 
Dec 27 2009
04e6ddd1afb9Thomas McGuire
Fix warning about unused function. 
Dec 27 2009
42de3dbb5295Thomas McGuire
Comment out debug output with std::cerr, which is annoying since it can't be… 
Dec 27 2009
c986460b0974Thomas McGuire
Disable these annoying qdebugs. 
Dec 27 2009
5444b9b1ac55Thomas McGuire
Remove bidi control characters here as well. 
Dec 26 2009
262a67753ef5Thomas McGuire
Grmbl, KHTML seems to ignore the PDF char, so all my work was moot... 
Dec 26 2009
c7bb65fda306Thomas McGuire
Prevent spoofing of the From address by using Unicode direction control chars… 
Dec 26 2009
c0b743decb43Thomas McGuire
I admit defeat: Disable the test. 
Dec 26 2009
69cbb6411534Thomas McGuire
SVN_SILENT typo 
Dec 26 2009
21d7ace9863bahartmetz
link with gold 
Dec 26 2009
1fabf667c212Thomas McGuire
Simplifiy 
Dec 25 2009
14ceae58b67fThomas McGuire
Simplify 
Dec 25 2009
4bb00b265a75Thomas McGuire
Port to qtestlib. 
Dec 25 2009
28a90ef13955Thomas McGuire
Print the actual input instead of "aStr" 
Dec 25 2009
2023c739a3dawinterz
minor coding style fixes SVN_SILENT: 
Dec 24 2009
5ddd088fdfa7winterz
updated, from Juliano BUG: 219758 MERGE: 4.3 
Dec 24 2009
2a16e263aa2fdjarvie
Fix addAttribute() so that it does nothing when re-adding the existing… 
Dec 23 2009
b18405aaed12Luboš Luňák
fix enable-final compile 
Dec 23 2009
d53d240f8975djarvie
apidox 
Dec 23 2009
c181b196d506Thomas McGuire
Add a quick test that KMime can deal with the mail from the bug report 
Dec 22 2009
db4f8de74debOlivier Trichet
Don't use QDir::separator() when we meant '/'. This does not work on Windows... 
Dec 22 2009
0a089f68c8b6skelly
Remove superfluous addAttribute calls. 
Dec 22 2009
93e36052bfdcAndrew Coles
Typo fixes: - in this context, someone would be used rather than anyone. 
Dec 21 2009
1dc8a73fa047ahartmetz
link with gold (undefined references to QApplication::...) 
Dec 20 2009
ebb0d13ea5abltoscano
I forgot to include klocale.h (see r1064342) 
Dec 20 2009
270af2506ad5ltoscano
Make untranslatable strings translatable. 
Dec 20 2009
e4bdf5a6be2dOlivier Trichet
Add more unit tests for Mail-Copies-To: header 
Dec 20 2009
182642690f41skelly
Add some hopefully clarifying remarks to the ETM dox. 
Dec 20 2009
43d64200b020skelly
ClassPrivate -> KClassPrivate 
Dec 20 2009
1c378122c26bskelly
Refactor the calls to private slots into methods. 
Dec 20 2009
ed4587c48821Script Kiddy
SVN_SILENT made messages (.desktop file) 
Dec 20 2009
6bd087a6a002krake
Make libmbox build with -DQT_NO_CAST_FROM_ASCII 
Dec 20 2009
795cb01695a8winterz
add a new static function LdapControl::insert() (formerly reviewed as… 
Dec 19 2009
bd5b853a035eOlivier Trichet
Fix parsing of header "Mail-Copies-To: nobody" 
Dec 19 2009
b9669a6cbfefkrake
Fix reading of appended but unsaved data: asserts need to check offset against… 
Dec 19 2009
42982f55e304krake
Fixing MBox::readEntryHeaders() !line[0] == '\n' is never true, left hand side… 
Dec 19 2009
bc4ca7c4a9eaDirk Mueller
bump for KDE 4.4 Beta2 
Dec 17 2009
87c9c1d18679Thomas McGuire
SVN_MERGE Merged revisions 1061324 via svnmerge from svn+ssh://tmcguire@svn.kde. 
Dec 16 2009
27811ea66aacThomas McGuire
SVN_MERGE Merged revisions 1058343 via svnmerge from svn+ssh://tmcguire@svn.kde. 
Dec 16 2009
9228ecb576bbScript Kiddy
SVN_SILENT made messages (.desktop file) 
Dec 16 2009
fa60729ae99edjarvie
Minor comment 
Dec 15 2009
d8d356eee26aThomas McGuire
Don't improperly format paths. This restores the previous behavior. 
Dec 15 2009
c38fd7cbfdaevkrause
SVN_MERGE 
Dec 15 2009