SVN_MERGE
Merged revisions 1012853-1012854,1012862,1012907,1012909-1012910,1012912,1012920,1012936,1012948,1012968,1012984,1013081,1013180 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs
........
r1012853 | vkrause | 2009-08-18 10:56:42 +0200 (Tue, 18 Aug 2009) | 3 lines Off by one in the tree depth. Fixes syncing of collection hierarchies with depth > 2 when using hierarchical RIDs.
........
r1012854 | vkrause | 2009-08-18 11:00:47 +0200 (Tue, 18 Aug 2009) | 4 lines Part 1 of fixing the missing RID race: Don't replay the next change before we have written back the (possible) RID changes of the previous one.
........
r1012862 | vkrause | 2009-08-18 11:29:28 +0200 (Tue, 18 Aug 2009) | 6 lines Part 2 of fixing the missing RID race: After changing the RID of a collection (esp. after just creating it in the resource), clear the internal ChangeRecorder collection cache. We might replay the next change that requires the new RID already before the server has informed us about the change.
........
r1012907 | tmcguire | 2009-08-18 13:16:55 +0200 (Tue, 18 Aug 2009) | 4 lines Now I know why the code didn't simply replace all spaces with nbsps: That would break word-wrapping. Therefore, take this into account and adjust the tests for it.
........
r1012909 | vkrause | 2009-08-18 13:18:13 +0200 (Tue, 18 Aug 2009) | 2 lines adapt to reality
........
r1012910 | vkrause | 2009-08-18 13:28:04 +0200 (Tue, 18 Aug 2009) | 3 lines Ignore local collections without remote ids during a sync since they have not been added to the resource yet.
........
r1012912 | tmcguire | 2009-08-18 13:42:36 +0200 (Tue, 18 Aug 2009) | 4 lines Fix spaces one and for all, hopefully. I forgot that in a sequence of spaces, all must be non-breaking, otherwise the breaking one isn't taken into account.
........
r1012920 | vkrause | 2009-08-18 13:49:59 +0200 (Tue, 18 Aug 2009) | 4 lines Same here, ignore local items without a remote id, those haven't been added to the resource yet and we don't want to overwrite them during a sync.
........
r1012936 | tmcguire | 2009-08-18 14:17:23 +0200 (Tue, 18 Aug 2009) | 3 lines Add tests for the two functions added yesterday, and also make sure to test the crash fix from yesterday.
........
r1012948 | vkrause | 2009-08-18 14:42:31 +0200 (Tue, 18 Aug 2009) | 2 lines turns out things don't need to go that wrong to end up here after all, so remove the warning
........
r1012968 | vkrause | 2009-08-18 15:25:19 +0200 (Tue, 18 Aug 2009) | 2 lines fix infinite recursion
........
r1012984 | tmcguire | 2009-08-18 16:00:39 +0200 (Tue, 18 Aug 2009) | 3 lines Make sure images are properly deleted from disk when removing them from the text edit, and add a test for that.
........
r1013081 | tmcguire | 2009-08-18 21:13:47 +0200 (Tue, 18 Aug 2009) | 3 lines More linebreak fixes. Add the possibility to insert signatures without additional linebreaks.
........
r1013180 | mlaurent | 2009-08-19 09:21:16 +0200 (Wed, 19 Aug 2009) | 2 lines Remove exectutable attribute
........
svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1013184