SVN_MERGE
Merged revisions 1032213,1032241,1032296,1032308,1032311,1032331-1032332,1032342,1032345 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs ................ r1032213 | skelly | 2009-10-07 12:04:35 +0200 (Wed, 07 Oct 2009) | 4 lines Fix crash in ETM when deep collections arrive before shallow ones. The dummy parents of the deep collections were not being inserted into the model, or updated when the real collections arrived. ................ r1032241 | tokoe | 2009-10-07 13:12:07 +0200 (Wed, 07 Oct 2009) | 2 lines Read in preferredEmail attribute as well!!! ................ r1032296 | skelly | 2009-10-07 15:56:54 +0200 (Wed, 07 Oct 2009) | 4 lines Fix the collectionFetched slot. Can't compare collections in the hash, so need to store and compare Collection::Ids instead and store the Collections separately. ................ r1032308 | skelly | 2009-10-07 16:15:47 +0200 (Wed, 07 Oct 2009) | 4 lines Use the QObject::receivers method to optimize item notifications. If there are no slots connected to the signals, there is no need to fetch all data from Akonadi in the first place. ................ r1032311 | winterz | 2009-10-07 16:24:03 +0200 (Wed, 07 Oct 2009) | 11 lines Blocked revisions 1032284 via svnmerge ........ r1032284 | winterz | 2009-10-07 09:33:01 -0400 (Wed, 07 Oct 2009) | 5 lines merge SVN commit 1030953 by winterz from trunk to e4: add a new static method for determining if a calendar is using Groupware. MERGE: none (already in trunk) ........ ................ r1032331 | skelly | 2009-10-07 17:09:44 +0200 (Wed, 07 Oct 2009) | 1 line Add ignore logic for move signal that got lost in a git add -p. ................ r1032332 | skelly | 2009-10-07 17:09:47 +0200 (Wed, 07 Oct 2009) | 1 line Use the model session when pasting. ................ r1032342 | skelly | 2009-10-07 17:23:54 +0200 (Wed, 07 Oct 2009) | 1 line Fix moves in the model. Don't ignore anything if LazyPopulation is not used. ................ r1032345 | tokoe | 2009-10-07 17:30:33 +0200 (Wed, 07 Oct 2009) | 2 lines Make the ContactView and ContactGroupView more pretty ................ svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1032553
parent
f7fe8da5
Please register or sign in to comment