[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-11-23 16:07:51
Message-ID: 1258992471.039029.1643.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1053198 by vkrause:
SVN_MERGE
Merged revisions 1051371,1051484,1051511,1051576,1051578,1051916,1051949,1051991,1051993,1052038,1052594 \
via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs
........
r1051371 | scripty | 2009-11-19 11:37:43 +0100 (Thu, 19 Nov 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1051484 | tokoe | 2009-11-19 16:59:34 +0100 (Thu, 19 Nov 2009) | 8 lines
Refactored SpecialCollections/SpecialCollectionsRequestJob to
be type agnostic.
Introduced SpecialMailCollections/SpecialMailCollectionsRequestJob
as email specific special collections classes.
Note: the unit tests are disabled for now, they are too ugly to port
........
r1051511 | tokoe | 2009-11-19 18:50:26 +0100 (Thu, 19 Nov 2009) | 2 lines
Disable the unit test, it makes use of private API in an ugly way
........
r1051576 | skelly | 2009-11-19 21:19:20 +0100 (Thu, 19 Nov 2009) | 3 lines
Add the dox from akonadi_next to kdepimlibs.
........
r1051578 | skelly | 2009-11-19 21:20:51 +0100 (Thu, 19 Nov 2009) | 3 lines
Add info about lazy population and selection based ref counting to the dox.
........
r1051916 | scripty | 2009-11-20 11:33:20 +0100 (Fri, 20 Nov 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r1051949 | tokoe | 2009-11-20 11:42:45 +0100 (Fri, 20 Nov 2009) | 2 lines
fix apidocs
........
r1051991 | tokoe | 2009-11-20 15:01:56 +0100 (Fri, 20 Nov 2009) | 2 lines
Forward errors to parent job
........
r1051993 | tokoe | 2009-11-20 15:03:02 +0100 (Fri, 20 Nov 2009) | 3 lines
Add RecentContactsCollectionRequestJob class that provides
the collection that shall be used for recent contacts.
........
r1052038 | tokoe | 2009-11-20 17:09:37 +0100 (Fri, 20 Nov 2009) | 2 lines
Fix logic bug: of course we have to handle new types as well
........
r1052594 | tokoe | 2009-11-22 10:29:00 +0100 (Sun, 22 Nov 2009) | 2 lines
Handle contacts that have no meta data set yet correctly
........
_M . (directory)
M +6 -0 akonadi/CMakeLists.txt
M +564 -1 akonadi/Mainpage.dox
M +5 -0 akonadi/contact/CMakeLists.txt
M +11 -2 akonadi/contact/contactmetadata.cpp
M +25 -1 akonadi/contact/editor/displaynameeditwidget.cpp
A akonadi/contact/recentcontactscollectionrequestjob.cpp \
trunk/KDE/kdepimlibs/akonadi/contact/recentcontactscollectionrequestjob.cpp#1052594 \
[License: LGPL (v2+)] A \
akonadi/contact/recentcontactscollectionrequestjob.h \
trunk/KDE/kdepimlibs/akonadi/contact/recentcontactscollectionrequestjob.h#1052594 \
[License: LGPL (v2+)] A akonadi/contact/recentcontactscollections.cpp \
trunk/KDE/kdepimlibs/akonadi/contact/recentcontactscollections.cpp#1052594 [License: \
LGPL (v2+)] A akonadi/contact/recentcontactscollections.kcfg \
trunk/KDE/kdepimlibs/akonadi/contact/recentcontactscollections.kcfg#1052594 A \
akonadi/contact/recentcontactscollections_p.h \
trunk/KDE/kdepimlibs/akonadi/contact/recentcontactscollections_p.h#1052594 [License: \
LGPL (v2+)] A akonadi/contact/recentcontactscollectionssettings.kcfgc \
trunk/KDE/kdepimlibs/akonadi/contact/recentcontactscollectionssettings.kcfgc#1052594 \
A akonadi/dox (directory) trunk/KDE/kdepimlibs/akonadi/dox#1052594 A \
akonadi/dox/bufferedcaching1.png \
trunk/KDE/kdepimlibs/akonadi/dox/bufferedcaching1.png#1052594 A \
akonadi/dox/bufferedcaching2.png \
trunk/KDE/kdepimlibs/akonadi/dox/bufferedcaching2.png#1052594 A \
akonadi/dox/bufferedcaching3.png \
trunk/KDE/kdepimlibs/akonadi/dox/bufferedcaching3.png#1052594 A \
akonadi/dox/bufferedcaching4.png \
trunk/KDE/kdepimlibs/akonadi/dox/bufferedcaching4.png#1052594 A \
akonadi/dox/bufferedcaching6.png \
trunk/KDE/kdepimlibs/akonadi/dox/bufferedcaching6.png#1052594 A \
akonadi/dox/descendantentitiesproxymodel-colfilter.png \
trunk/KDE/kdepimlibs/akonadi/dox/descendantentitiesproxymodel-colfilter.png#1052594 \
A akonadi/dox/descendantentitiesproxymodel-withansecnames.png \
trunk/KDE/kdepimlibs/akonadi/dox/descendantentitiesproxymodel-withansecnames.png#1052594
A akonadi/dox/descendantentitiesproxymodel.png \
trunk/KDE/kdepimlibs/akonadi/dox/descendantentitiesproxymodel.png#1052594 A \
akonadi/dox/entitytreemodel-collections.png \
trunk/KDE/kdepimlibs/akonadi/dox/entitytreemodel-collections.png#1052594 A \
akonadi/dox/entitytreemodel-showroot.png \
trunk/KDE/kdepimlibs/akonadi/dox/entitytreemodel-showroot.png#1052594 A \
akonadi/dox/entitytreemodel-showrootwithname.png \
trunk/KDE/kdepimlibs/akonadi/dox/entitytreemodel-showrootwithname.png#1052594 A \
akonadi/dox/entitytreemodel.png \
trunk/KDE/kdepimlibs/akonadi/dox/entitytreemodel.png#1052594 A \
akonadi/dox/mailmodelapp.png \
trunk/KDE/kdepimlibs/akonadi/dox/mailmodelapp.png#1052594 A \
akonadi/dox/selectionproxymodel-ordered.png \
trunk/KDE/kdepimlibs/akonadi/dox/selectionproxymodel-ordered.png#1052594 A \
akonadi/dox/selectionproxymodelmultipleselection-withdescendant.png \
trunk/KDE/kdepimlibs/akonadi/dox/selectionproxymodelmultipleselection-withdescendant.png#1052594
A akonadi/dox/selectionproxymodelmultipleselection.png \
trunk/KDE/kdepimlibs/akonadi/dox/selectionproxymodelmultipleselection.png#1052594 A \
akonadi/dox/selectionproxymodelsimpleselection.png \
trunk/KDE/kdepimlibs/akonadi/dox/selectionproxymodelsimpleselection.png#1052594 A \
akonadi/dox/treeandlistapp.png \
trunk/KDE/kdepimlibs/akonadi/dox/treeandlistapp.png#1052594 A \
akonadi/dox/treeandlistappwithdesclist.png \
trunk/KDE/kdepimlibs/akonadi/dox/treeandlistappwithdesclist.png#1052594 M +8 -15 \
akonadi/kmime/CMakeLists.txt D \
akonadi/kmime/specialcollectionattribute.cpp D \
akonadi/kmime/specialcollectionattribute_p.h D \
akonadi/kmime/specialcollections.cpp D \
akonadi/kmime/specialcollections.h D \
akonadi/kmime/specialcollections.kcfg D \
akonadi/kmime/specialcollections_p.h D \
akonadi/kmime/specialcollectionshelperjobs.cpp D \
akonadi/kmime/specialcollectionshelperjobs_p.h D \
akonadi/kmime/specialcollectionsrequestjob.cpp D \
akonadi/kmime/specialcollectionsrequestjob.h D \
akonadi/kmime/specialcollectionssettings.kcfgc D \
akonadi/kmime/specialcollectionstesting.cpp D \
akonadi/kmime/specialcollectionstesting.h A \
akonadi/kmime/specialmailcollections.cpp \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollections.cpp#1052594 [License: LGPL \
(v2+)] A akonadi/kmime/specialmailcollections.h \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollections.h#1052594 [License: LGPL \
(v2+)] A akonadi/kmime/specialmailcollections.kcfg \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollections.kcfg#1052594 A \
akonadi/kmime/specialmailcollectionsrequestjob.cpp \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollectionsrequestjob.cpp#1052594 \
[License: LGPL (v2+)] A akonadi/kmime/specialmailcollectionsrequestjob.h \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollectionsrequestjob.h#1052594 \
[License: LGPL (v2+)] A \
akonadi/kmime/specialmailcollectionssettings.kcfgc \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollectionssettings.kcfgc#1052594 A \
akonadi/kmime/specialmailcollectionstesting.cpp \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollectionstesting.cpp#1052594 \
[License: LGPL (v2+)] A akonadi/kmime/specialmailcollectionstesting_p.h \
trunk/KDE/kdepimlibs/akonadi/kmime/specialmailcollectionstesting_p.h#1052594 \
[License: LGPL (v2+)] M +72 -72 \
akonadi/kmime/tests/localfoldersrequestjobtest.cpp M +10 -10 \
akonadi/kmime/tests/localfolderstest.cpp A \
akonadi/specialcollectionattribute.cpp \
trunk/KDE/kdepimlibs/akonadi/specialcollectionattribute.cpp#1052594 [License: LGPL \
(v2+)] A akonadi/specialcollectionattribute_p.h \
trunk/KDE/kdepimlibs/akonadi/specialcollectionattribute_p.h#1052594 [License: LGPL \
(v2+)] A akonadi/specialcollections.cpp \
trunk/KDE/kdepimlibs/akonadi/specialcollections.cpp#1052594 [License: LGPL (v2+)] A \
akonadi/specialcollections.h \
trunk/KDE/kdepimlibs/akonadi/specialcollections.h#1052594 [License: LGPL (v2+)] A \
akonadi/specialcollections_p.h \
trunk/KDE/kdepimlibs/akonadi/specialcollections_p.h#1052594 [License: LGPL (v2+)] A \
akonadi/specialcollectionshelperjobs.cpp \
trunk/KDE/kdepimlibs/akonadi/specialcollectionshelperjobs.cpp#1052594 [License: LGPL \
(v2+)] A akonadi/specialcollectionshelperjobs_p.h \
trunk/KDE/kdepimlibs/akonadi/specialcollectionshelperjobs_p.h#1052594 [License: LGPL \
(v2+)] A akonadi/specialcollectionsrequestjob.cpp \
trunk/KDE/kdepimlibs/akonadi/specialcollectionsrequestjob.cpp#1052594 [License: LGPL \
(v2+)] A akonadi/specialcollectionsrequestjob.h \
trunk/KDE/kdepimlibs/akonadi/specialcollectionsrequestjob.h#1052594 [License: LGPL \
(v2+)] M +1 -0 kabc/plugins/ldapkio/ldapkio.desktop
M +1 -1 kresources/kresources.desktop
M +3 -3 mailtransport/dispatcherinterface.cpp
M +6 -6 mailtransport/messagequeuejob.cpp
M +5 -5 mailtransport/tests/clearerror.cpp
M +7 -7 mailtransport/tests/messagequeuejobtest.cpp
M +5 -5 mailtransport/tests/sendqueued.cpp
http://websvn.kde.org/?view=rev&revision=1053198
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic