HomePhorge

Merged revisions 976475,976730,976756,976817,976960,977049,977059,977222…
9a635739cb40Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merged revisions 976475,976730,976756,976817,976960,977049,977059,977222,977258,977262,977337,977733,977867,978139,978171,978206,978208,978251,978919,978977,978990,979264,979288,979314,979328,979333,979367,979379,979381 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........

r976475 | vkrause | 2009-06-01 21:04:08 +0200 (Mon, 01 Jun 2009) | 2 lines

Add support for collection streaming, needed by the IMAP resource.

........

r976730 | scripty | 2009-06-02 15:44:39 +0200 (Tue, 02 Jun 2009) | 1 line

SVN_SILENT made messages (.desktop file)

........

r976756 | vkrause | 2009-06-02 16:38:00 +0200 (Tue, 02 Jun 2009) | 2 lines

Fix resource hangs after moving items.

........

r976817 | igorto | 2009-06-02 20:07:55 +0200 (Tue, 02 Jun 2009) | 1 line

code cleanup

........

r976960 | vkrause | 2009-06-03 08:31:19 +0200 (Wed, 03 Jun 2009) | 4 lines

Don't confuse the translation script.

CCMAIL: aacid@kde.org

........

r977049 | cgiboudeaux | 2009-06-03 14:00:23 +0200 (Wed, 03 Jun 2009) | 1 line

Sync version with the kdelibs' one

........

r977059 | igorto | 2009-06-03 14:27:06 +0200 (Wed, 03 Jun 2009) | 1 line

fix some hacks

........

r977222 | mueller | 2009-06-03 17:49:47 +0200 (Wed, 03 Jun 2009) | 2 lines

bump version

........

r977258 | vkrause | 2009-06-03 19:58:49 +0200 (Wed, 03 Jun 2009) | 2 lines

Require a newer Akonadi server.

........

r977262 | mueller | 2009-06-03 20:10:12 +0200 (Wed, 03 Jun 2009) | 2 lines

fix version number

........

r977337 | otrichet | 2009-06-03 23:30:20 +0200 (Wed, 03 Jun 2009) | 4 lines

Check whether the day changed so that "Today" is accurate in fancy formatting

BUG: 178035
REVIEW: http://reviewboard.kde.org/r/661/

........

r977733 | bbroeksema | 2009-06-05 11:13:31 +0200 (Fri, 05 Jun 2009) | 8 lines

There seem to be some problems with the sizes of items during copying itmes.
This commit adds some additionial checks to the item copy test. After the copy
the source item is fetched first. Then the source as well as the target item
are checked to have a size > 0 and sizes of both items should be equal.

Currently the item size > 0 check fails for both. (They're both marked with
QEXPECT_FAIL).

........

r977867 | winterz | 2009-06-05 17:04:10 +0200 (Fri, 05 Jun 2009) | 4 lines

fix printing of COMMENTS and DESCRIPTION properties in invitations.

MERGE: e4

........

r978139 | vkrause | 2009-06-06 10:17:46 +0200 (Sat, 06 Jun 2009) | 3 lines

Partially revert revision 977059 which broke creating multiple agents of
the same type and thus several of our unit tests.

........

r978171 | vkrause | 2009-06-06 11:35:30 +0200 (Sat, 06 Jun 2009) | 4 lines

- don't overwrite item size on the server if it wasn't explicitly
  changed on the client side
- add a few more tests for item size handling

........

r978206 | tokoe | 2009-06-06 14:21:48 +0200 (Sat, 06 Jun 2009) | 2 lines

Add apidocs

........

r978208 | tokoe | 2009-06-06 14:24:29 +0200 (Sat, 06 Jun 2009) | 2 lines

Update the actions after the text has changed in setActionText()

........

r978251 | winterz | 2009-06-06 17:29:21 +0200 (Sat, 06 Jun 2009) | 5 lines

Lots of cleanups and beautification for displaying Invitations for the bodypart formatter.
No new i18n strings here, but there are comments for changing some in 4.4.

MERGE: e4 (feel free to make the commented i18n string changes)

........

r978919 | tokoe | 2009-06-08 16:50:05 +0200 (Mon, 08 Jun 2009) | 2 lines

Make the root collection read-only for users

........

r978977 | winterz | 2009-06-08 19:50:29 +0200 (Mon, 08 Jun 2009) | 4 lines

fix print of invitation time changes to use the local timezone.

MERGE: none (already in e4)

........

r978990 | sebsauer | 2009-06-08 20:09:04 +0200 (Mon, 08 Jun 2009) | 3 lines

If to register the org::freedesktop::Akonadi::AgentManager dbus-interface fails cause e.g. dbus is not running, assert as early as possible and provide some hint rather then to assert later in qdbuspendingreply.cpp:273 cause d==NULL (btw cookies for those who finds the bug in QDBusPendingReplyData::argumentAt - hint: d can be NULL)

........

r979264 | vkrause | 2009-06-09 14:05:57 +0200 (Tue, 09 Jun 2009) | 3 lines

Try to fix translations of Akonadi resources as suggested by
Burkhard Lueck.

........

r979288 | sebsauer | 2009-06-09 15:28:08 +0200 (Tue, 09 Jun 2009) | 3 lines

it can happen that !d->mManager->isValid() if the server is not running yet but started right after the manager got created. So, the solution to fix the assert is to just don't ask for the agentTypes() and agentInstances() in that case since they are empty anyway.

........

r979314 | vkrause | 2009-06-09 16:14:10 +0200 (Tue, 09 Jun 2009) | 4 lines

Ignore invalid fields when comparing tasks. This prevents the creation
of too many change replay tasks which could cause the resource to hang.
Found by Thomas McGuire.

........

r979328 | tmcguire | 2009-06-09 16:48:04 +0200 (Tue, 09 Jun 2009) | 1 line

Add an inital version of the unit test for the resource scheduler.

........

r979333 | scripty | 2009-06-09 16:48:41 +0200 (Tue, 09 Jun 2009) | 1 line

SVN_SILENT made messages (.desktop file)

........

r979367 | tmcguire | 2009-06-09 17:16:59 +0200 (Tue, 09 Jun 2009) | 2 lines

Extend the resource scheduler test a bit

........

r979379 | tmcguire | 2009-06-09 17:55:13 +0200 (Tue, 09 Jun 2009) | 2 lines

Extend the tests a bit to check for the new signal when there are no changes to process.

........

r979381 | tmcguire | 2009-06-09 18:13:02 +0200 (Tue, 09 Jun 2009) | 1 line

SVN_SILENT remove unused code.

........

svn path=/branches/kdepim/soc/kdepimlibs/; revision=979401

Event Timeline

Merged Changes