Authored by vkrause on Aug 25 2009, 7:37 AM.

Description

SVN_MERGE

Merged revisions 1015048-1015049,1015075,1015094,1015117,1015121,1015133,1015195 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........

r1015048 | skelly | 2009-08-24 14:08:03 +0200 (Mon, 24 Aug 2009) | 1 line

Add api to serializers for merging of parts, and for notifying which parts are available for an item.

........

r1015049 | skelly | 2009-08-24 14:08:19 +0200 (Mon, 24 Aug 2009) | 3 lines

Make available parts accessible through the model via a part fetcher class.

Also merge items when they are updated instead of replacing them in the internal store.

........

r1015075 | tokoe | 2009-08-24 14:50:26 +0200 (Mon, 24 Aug 2009) | 2 lines

Fixed coding style and apidox

........

r1015094 | tokoe | 2009-08-24 15:29:14 +0200 (Mon, 24 Aug 2009) | 2 lines

Changed the PartFetcher into a KJob based class

........

r1015117 | skelly | 2009-08-24 17:09:45 +0200 (Mon, 24 Aug 2009) | 6 lines

Change how missing ancestors are inserted into the model.

If an ancestor is filtered out, and we wish to show one of its descendants in the model,
the ancestor is not in the model, so it must be fetched.

Now a minimal collection is inserted into the Collection tree and a job for the actual ancestor collection is started.

........

r1015121 | vkrause | 2009-08-24 17:26:18 +0200 (Mon, 24 Aug 2009) | 2 lines

Add protocol code for hierarchical RID based operations.

........

r1015133 | vkrause | 2009-08-24 17:53:45 +0200 (Mon, 24 Aug 2009) | 2 lines

Support collection retrieval based on hierarchical RIDs.

........

r1015195 | mkoller | 2009-08-24 23:18:34 +0200 (Mon, 24 Aug 2009) | 6 lines

BUG: 202445

Try much better to discover a URL, even if it is enclosed with
some sort of brackets/quotes and even interrupted by line breaks or white space.
RFC3986 explains this in appendix C

........

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

Details

Committed
vkrauseAug 25 2009, 7:37 AM
Parents
R173:1ab4deadf42f: SVN_MERGE
R173:e52b9858e31c: BUG: 202445
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
e52b9858e31cMartin Koller
BUG: 202445 
Aug 24 2009
a83666b70c30vkrause
Support collection retrieval based on hierarchical RIDs. 
Aug 24 2009
fcbd397c0972vkrause
Add protocol code for hierarchical RID based operations. 
Aug 24 2009
d89a965ce2f9skelly
Change how missing ancestors are inserted into the model. 
Aug 24 2009
9d2b00c6d8bbTobias Koenig
Changed the PartFetcher into a KJob based class 
Aug 24 2009
3bd6c0db3fdbTobias Koenig
Fixed coding style and apidox 
Aug 24 2009
7692f5d8affbskelly
Make available parts accessible through the model via a part fetcher class. 
Aug 24 2009
3ccde5fedf0askelly
Add api to serializers for merging of parts, and for notifying which parts are… 
Aug 24 2009