[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepimlibs (merge)
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-12-29 14:44:53
Message-ID: 1262097893.884955.666.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1067401 by vkrause:

SVN_MERGE

Merged revisions 1065913,1065939,1066123,1066128-1066129,1066131,1066158,1066349,10663 \
58,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.
........


 _M            . (directory)  
 M  +1 -1      CMakeLists.txt  
 M  +36 -26    akonadi/Mainpage.dox  
 M  +0 -2      akonadi/collection.h  
 M  +26 -23    akonadi/entity.cpp  
 M  +0 -6      akonadi/entity.h  
 M  +4 -10     akonadi/entity_p.h  
 M  +7 -7      akonadi/entitytreemodel.h  
 M  +2 -0      gpgme++/context.cpp  
 M  +5 -5      gpgme++/data.cpp  
 M  +11 -9     gpgme++/util.h  
 M  +3 -1      kcal/incidenceformatter.cpp  
 M  +126 -21   kholidays/holidays/holiday_br  
 M  +10 -3     kmime/kmime_content.cpp  
 M  +5 -0      kmime/kmime_content.h  
 M  +5 -3      kmime/kmime_header_parsing.cpp  
 M  +1 -1      kmime/kmime_message.h  
 M  +72 -4     kmime/kmime_util.cpp  
 M  +51 -0     kmime/kmime_util.h  
 M  +2 -2      kmime/tests/CMakeLists.txt  
 M  +104 -0    kmime/tests/kmime_message_test.cpp  
 M  +3 -0      kmime/tests/kmime_message_test.h  
 M  +39 -0     kmime/tests/kmime_util_test.cpp  
 M  +2 -0      kmime/tests/kmime_util_test.h  
 M  +8 -7      kpimutils/email.cpp  
 M  +1 -1      kpimutils/tests/CMakeLists.txt  
 M  +352 -394  kpimutils/tests/testemail.cpp  
 A             kpimutils/tests/testemail.h   \
trunk/KDE/kdepimlibs/kpimutils/tests/testemail.h#1066611 [License: LGPL (v2)]  M  +2 \
-2      kresources/kresources_plugin.desktop    M  +5 -5      qgpgme/dataprovider.cpp \



http://websvn.kde.org/?view=rev&revision=1067401


[prev in list] [next in list] [prev in thread] [next in thread]