SVN_MERGE
Merged revisions 1000359,1000365-1000366,1000372,1000391,1000401-1000402,1000406,1000428,1000431-1000432,1000442,1000453,1000460,1000464,1000470,1000483,1000533-1000534,1000542,1000548,1000614,1000617,1000668,1000729,1000744,1000770,1000776,1000778-1000779,1000790,1000822,1000847,1000880,1000886-1000887,1000891,1000895,1000898,1000999,1001001,1001137,1001203,1001256,1001261,1001263,1001329,1001364,1001498,1001525,1001529,1001541,1001545,1001553,1001599,1001666,1001795,1001874,1001888,1001895,1001898,1001922,1001926-1001928,1001946,1001957,1002046,1002059,1002081,1002105,1002178,1002191-1002193,1002295,1002343,1002356,1002413,1002444,1002525,1002617-1002618,1002657,1002672,1002675,1002770,1002846 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1000359 | skelly | 2009-07-21 10:10:54 +0200 (Tue, 21 Jul 2009) | 2 lines Remove kdeui_next now that it's in kdelibs.
................
r1000365 | skelly | 2009-07-21 10:32:50 +0200 (Tue, 21 Jul 2009) | 3 lines Remove the dependancy of EntityTreeModel on custom AbstractItemModel. The most significant part of that (moves) should be in Qt4.6 eventually.
................
r1000366 | skelly | 2009-07-21 10:32:54 +0200 (Tue, 21 Jul 2009) | 1 line Remove CollectionChildOrderAttribtute include. It's not used or finished yet.
................
r1000372 | skelly | 2009-07-21 10:45:54 +0200 (Tue, 21 Jul 2009) | 3 lines Move EntityTreeModel into kdepimlibs.
................
r1000391 | skelly | 2009-07-21 11:16:35 +0200 (Tue, 21 Jul 2009) | 1 line Port KContactManager to the models now in kdepimlibs.
................
r1000401 | skelly | 2009-07-21 11:25:13 +0200 (Tue, 21 Jul 2009) | 1 line Remove tests now in kdelibs and selectionproxtmodel now in kdepimlibs/kdelibs.
................
r1000402 | skelly | 2009-07-21 11:25:17 +0200 (Tue, 21 Jul 2009) | 1 line Port over to the kdepimlibs version of ETM.
................
r1000406 | skelly | 2009-07-21 11:31:23 +0200 (Tue, 21 Jul 2009) | 1 line Remove the abstract item and model classes and port the rest to the kdepimlibs version of ETM.
................
r1000428 | skelly | 2009-07-21 12:00:07 +0200 (Tue, 21 Jul 2009) | 1 line Use kdepimlibs ETM.
................
r1000431 | skelly | 2009-07-21 12:06:12 +0200 (Tue, 21 Jul 2009) | 1 line Remove old stuff lying around.
................
r1000432 | skelly | 2009-07-21 12:06:14 +0200 (Tue, 21 Jul 2009) | 1 line Fix include.
................
r1000442 | skelly | 2009-07-21 12:24:10 +0200 (Tue, 21 Jul 2009) | 2 lines Move more proxies from kdepim into kdepimlibs.
................
r1000453 | cgiboudeaux | 2009-07-21 13:19:41 +0200 (Tue, 21 Jul 2009) | 1 line Fix includes
................
r1000460 | skelly | 2009-07-21 13:36:46 +0200 (Tue, 21 Jul 2009) | 1 line Update comment with new name of class.
................
r1000464 | cgiboudeaux | 2009-07-21 13:50:41 +0200 (Tue, 21 Jul 2009) | 1 line Fix includes (more to come soon)
................
r1000470 | cgiboudeaux | 2009-07-21 14:07:41 +0200 (Tue, 21 Jul 2009) | 1 line Fix include.
................
r1000483 | skelly | 2009-07-21 14:39:15 +0200 (Tue, 21 Jul 2009) | 3 lines Remove hide child collections stuff. It is unused and is probably an old idea I had before SelectionProxyModel. http://websvn.kde.org:80/?view=rev&revision=908212
................
r1000533 | vkrause | 2009-07-21 16:28:34 +0200 (Tue, 21 Jul 2009) | 2 lines Use the ETM state saver.
................
r1000534 | vkrause | 2009-07-21 16:29:52 +0200 (Tue, 21 Jul 2009) | 3 lines Use a distinct object name, otherwise the UI state saver gets confused and messes up the splitter sizes.
................
r1000542 | cgiboudeaux | 2009-07-21 16:41:05 +0200 (Tue, 21 Jul 2009) | 4 lines Don't return the korganizer version but the akonadi one. BACKPORT: 4.3 (this string is not translated)
................
r1000548 | cgiboudeaux | 2009-07-21 16:49:43 +0200 (Tue, 21 Jul 2009) | 1 line Add a copyright
................
r1000614 | djarvie | 2009-07-21 19:22:20 +0200 (Tue, 21 Jul 2009) | 2 lines Remove unused parameter
................
r1000617 | djarvie | 2009-07-21 19:32:01 +0200 (Tue, 21 Jul 2009) | 1 line Tidy
................
r1000668 | lueck | 2009-07-21 20:46:26 +0200 (Tue, 21 Jul 2009) | 1 line fixed typo not found by Yuri
................
r1000729 | cgiboudeaux | 2009-07-21 23:48:47 +0200 (Tue, 21 Jul 2009) | 1 line KDE4_ -> KDEPIMLIBS_ (see http://techbase.kde.org/Development/CMake_KDE_4_2#How_to_use_KdepimLibs)
................
r1000744 | cgiboudeaux | 2009-07-22 00:45:57 +0200 (Wed, 22 Jul 2009) | 5 lines Don't set an icon for the bookmark menu or the text will be replaced with any theme != oxygen BUG: 196279 MERGE:4.3
................
r1000770 | cgiboudeaux | 2009-07-22 01:59:20 +0200 (Wed, 22 Jul 2009) | 1 line The ParentApp is kjots, not knotes
................
r1000776 | cgiboudeaux | 2009-07-22 02:02:49 +0200 (Wed, 22 Jul 2009) | 1 line Add an icon
................
r1000778 | djarvie | 2009-07-22 02:22:00 +0200 (Wed, 22 Jul 2009) | 2 lines Fix error messages for display alarms
................
r1000779 | djarvie | 2009-07-22 02:29:00 +0200 (Wed, 22 Jul 2009) | 2 lines Fix another error message
................
r1000790 | djarvie | 2009-07-22 03:14:59 +0200 (Wed, 22 Jul 2009) | 2 lines Tidy
................
r1000822 | lueck | 2009-07-22 08:34:11 +0200 (Wed, 22 Jul 2009) | 1 line add missing X-DocPath
................
r1000847 | skelly | 2009-07-22 09:53:28 +0200 (Wed, 22 Jul 2009) | 1 line Don't fetch items into the collection tree yet.
................
r1000880 | tmcguire | 2009-07-22 11:15:10 +0200 (Wed, 22 Jul 2009) | 747 lines
Block these cyclic merges and other block-worthy stuff
SVN_SILENT
SVN_MERGE
--
Blocked revisions 997271,997278,997281,997284,997293,997300,997421,997440,997446,997450,997458,997464,997467,997470,997473,997478-997479,997481-997482,997485,997502,997505,997510,997512,997523,997532-997535,997537-997538,997541,997544,997547,997934,998148,998231,998236,998282,998285,998302,998340 via svnmerge
................
r997271 | tmcguire | 2009-07-15 19:22:59 +0200 (Wed, 15 Jul 2009) | 14 lines
Merged revisions 991932 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
........
r991932 | cgiboudeaux | 2009-07-06 02:40:17 +0200 (Mon, 06 Jul 2009) | 7 lines
backport r991931 from trunk to 4.3:
Add holidays for India.
Original patch by Kharthik. Thanks.
Only the fixed dates will be available for now.
Some special dates depend on the moon or change every year.
CCBUG: 199079
........
................
r997278 | tmcguire | 2009-07-15 19:43:15 +0200 (Wed, 15 Jul 2009) | 196 lines
Block Akonadi, KPilot, KTimetracker, KAlarm, scripty, cyclic merges, release stuff.
SVN_SILENT
--
Blocked revisions 986245,986536,986635,986638,986642,987496,988089,988309,989145,989201,989321,989428,989682,990334,990589,991134,991343,991521,991858,992124,992533,992552,992599,993090,994113,994386,994429,994450,994620,994717,995065,995156,995496,995774,996338 via svnmerge
................
r986245 | vanrijn | 2009-06-24 14:21:43 +0200 (Wed, 24 Jun 2009) | 1 line
bumping PLUGIN_API and KPILOT_VERSION to match KDE 4.3.0-rc1
................
r986536 | djarvie | 2009-06-24 20:22:55 +0200 (Wed, 24 Jun 2009) | 1 line
Tidy up icon
................
r986635 | tmcguire | 2009-06-24 22:16:21 +0200 (Wed, 24 Jun 2009) | 12 lines
Backport r986572 by tmcguire from trunk to the 4.3 branch:
Merged revisions 983778 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r983778 | mutz | 2009-06-19 09:23:06 +0200 (Fri, 19 Jun 2009) | 1 line
main.cpp: Initialize GpgME library.
........
................
r986638 | tmcguire | 2009-06-24 22:19:54 +0200 (Wed, 24 Jun 2009) | 12 lines
Backport r986573 by tmcguire from trunk to the 4.3 branch:
Merged revisions 983785 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r983785 | mutz | 2009-06-19 09:37:24 +0200 (Fri, 19 Jun 2009) | 1 line
Kleo::QGpgMEBackend: init gpgme lib here, too.
........
................
r986642 | tmcguire | 2009-06-24 22:22:54 +0200 (Wed, 24 Jun 2009) | 18 lines
Backport r986576 by tmcguire from trunk to the 4.3 branch:
Merged revisions 983858 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r983858 | tmcguire | 2009-06-19 13:34:23 +0200 (Fri, 19 Jun 2009) | 8 lines
Fix saving distribution lists when using the Kolab resource.
The resource was never notified about the new entries in the list.
Kevin, please have a quick look and tell me in case I did anything wrong.
CCMAIL: kevin.krammer@gmx.at
MERGE: trunk
........
................
r987496 | scripty | 2009-06-26 10:24:55 +0200 (Fri, 26 Jun 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r988089 | scripty | 2009-06-27 10:59:04 +0200 (Sat, 27 Jun 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r988309 | bbroeksema | 2009-06-27 21:08:23 +0200 (Sat, 27 Jun 2009) | 2 lines
Backport of r988308
................
r989145 | winterz | 2009-06-29 17:09:23 +0200 (Mon, 29 Jun 2009) | 4 lines
The mbox Akonadi resource is not ready for the 4.3 release -- comment the
add_subdirectory(mbox) command then. We plan to make it ready in KDE 4.4.
................
r989201 | winterz | 2009-06-29 20:15:14 +0200 (Mon, 29 Jun 2009) | 2 lines
remove the mbox source code since it isn't ready and makes things easier for the translators.
................
r989321 | sengels | 2009-06-30 01:04:46 +0200 (Tue, 30 Jun 2009) | 2 lines
backport r986963
win32 compile fix: define set AKONADI_NEXT_EXPORT empty, because the used classes from the akonadi_next library are included directly and do not need any decoration
................
r989428 | tmcguire | 2009-06-30 11:24:14 +0200 (Tue, 30 Jun 2009) | 2 lines
Remove KContactManager from the KDE 4.3 branch, as discussed on the mailing list.
................
r989682 | krake | 2009-06-30 19:22:27 +0200 (Tue, 30 Jun 2009) | 4 lines
Backport of revision 989678
Add the two missing supported base MIME types.
................
r990334 | jriddell | 2009-07-02 13:19:47 +0200 (Thu, 02 Jul 2009) | 1 line
add licence files since this is being released separately
................
r990589 | dfaure | 2009-07-02 21:25:44 +0200 (Thu, 02 Jul 2009) | 2 lines
Fix link error about soprano not being linked in - the fix was found by Brad King
................
r991134 | scripty | 2009-07-04 10:22:12 +0200 (Sat, 04 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r991343 | djarvie | 2009-07-04 18:40:11 +0200 (Sat, 04 Jul 2009) | 1 line
Fix --subject which takes a parameter
................
r991521 | scripty | 2009-07-05 10:02:45 +0200 (Sun, 05 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r991858 | winterz | 2009-07-05 21:59:02 +0200 (Sun, 05 Jul 2009) | 3 lines
looks like we'll have an RC2 for kde4.3. up the version string accordingly.
CCMAIL: kde-pim@kde.org
................
r992124 | tstaerk | 2009-07-06 12:35:24 +0200 (Mon, 06 Jul 2009) | 1 line
Do not crash when right-clicking on a task. Commit has been discussed and agreed on irc.
................
r992533 | scripty | 2009-07-07 09:51:42 +0200 (Tue, 07 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r992552 | tstaerk | 2009-07-07 10:46:45 +0200 (Tue, 07 Jul 2009) | 3 lines
Do not crash when exiting via the systray icon's context menu.
CCBUGS:194867
................
r992599 | djarvie | 2009-07-07 13:14:15 +0200 (Tue, 07 Jul 2009) | 2 lines
Fix crash when deleting an alarm which has an entry in the 'redo' list.
................
r993090 | cgiboudeaux | 2009-07-08 11:00:40 +0200 (Wed, 08 Jul 2009) | 1 line
bump version
................
r994113 | scripty | 2009-07-10 10:09:39 +0200 (Fri, 10 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r994386 | djarvie | 2009-07-10 16:53:22 +0200 (Fri, 10 Jul 2009) | 1 line
Fix alarms not being triggered if reminders occur AFTER the main alarm
................
r994429 | djarvie | 2009-07-10 17:13:56 +0200 (Fri, 10 Jul 2009) | 1 line
Update version number
................
r994450 | djarvie | 2009-07-10 17:23:59 +0200 (Fri, 10 Jul 2009) | 1 line
Fix errors
................
r994620 | dfaure | 2009-07-10 23:41:12 +0200 (Fri, 10 Jul 2009) | 3 lines
Backport the fix for the error while migrating the kde-accounts kresource. Includes a new i18n,
but that's for a bugfix and it's rather unlikely end users get to see it at all :-)
................
r994717 | scripty | 2009-07-11 11:14:13 +0200 (Sat, 11 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r995065 | lueck | 2009-07-11 23:39:03 +0200 (Sat, 11 Jul 2009) | 1 line
fix i18n bug: create new catalog for akonadi kcalresource and kabcresource
................
r995156 | scripty | 2009-07-12 09:51:24 +0200 (Sun, 12 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
r995496 | winterz | 2009-07-12 23:01:34 +0200 (Sun, 12 Jul 2009) | 3 lines
make nie and nie_fast build against kdelibs 4.4 by using a conditional to
determine the correct macro file to include.
................
r995774 | ervin | 2009-07-13 13:33:52 +0200 (Mon, 13 Jul 2009) | 11 lines
Fix the crash (caused by one assert) when we clone a quota attribute
where one of the roots has a space in its name. It was wrong to assume
it'd never happen and use space as a valid separator. Now using '%'.
This change is supposedly not backward compatible as the serialization
format changed in an incompatible way. Here the upgrade worked without
intervention from me though.
Backport from trunk revision 995771.
................
r996338 | scripty | 2009-07-14 09:53:49 +0200 (Tue, 14 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
................
................
r997281 | tmcguire | 2009-07-15 19:45:16 +0200 (Wed, 15 Jul 2009) | 14 lines
Another Akonadi Block I missed.
SVN_SILENT
--
Blocked revisions 986695 via svnmerge
........
r986695 | woebbe | 2009-06-25 00:05:21 +0200 (Thu, 25 Jun 2009) | 4 lines
link (with gold?)
I'm not sure why I need KDE4_KIO_LIBS as KDE4_KUTILS_LIBS depends on it. Is this
caused by the LINK_INTERFACE_LIBRARIES stuff?
........
................
r997284 | tmcguire | 2009-07-15 19:49:19 +0200 (Wed, 15 Jul 2009) | 18 lines
Already merged by Allen's big libkdepim update.
SVN_SILENT
--
Recorded merge of revisions 990531 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r990531 | winterz | 2009-07-02 17:35:14 +0200 (Thu, 02 Jul 2009) | 8 lines
backport SVN commit 990529 by winterz:
remove the FIXME HACK in addAddressee() that should no longer be needed and should
have been removed waaaayyy back in 4.0.
Might fix some of the kmail freeze problems when adding emails to the addressbook.
Let's assume that it does until reported otherwise.
........
................
r997293 | tmcguire | 2009-07-15 19:57:34 +0200 (Wed, 15 Jul 2009) | 12 lines
Block this, otherwise it doesn't link for me.
SVN_SILENT
--
Blocked revisions 990610 via svnmerge
........
r990610 | dfaure | 2009-07-02 22:17:34 +0200 (Thu, 02 Jul 2009) | 3 lines
kmail, and unit tests, all need to link to this otherwise they fail, too, with a missing soprano symbol.
No clue why I seem to be the only one hitting this, though.
........
................
r997300 | tmcguire | 2009-07-15 20:00:43 +0200 (Wed, 15 Jul 2009) | 16 lines
Already manually merged by Allen.
SVN_SILENT
--
Recorded merge of revisions 991732 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r991732 | winterz | 2009-07-05 16:19:52 +0200 (Sun, 05 Jul 2009) | 6 lines
backport SVN commit 991731 by winterz:
give up on trying to elide the text in the QLineEdit part of this widget.
really, I think this is a bug at a lower level (in Qt maybe) because
I don't think the user should have to worry about fitting their text.
........
................
r997421 | tmcguire | 2009-07-15 22:09:57 +0200 (Wed, 15 Jul 2009) | 13 lines
Not needed here.
SVN_SILENT
--
Blocked revisions 992176 via svnmerge
........
r992176 | cgiboudeaux | 2009-07-06 14:27:08 +0200 (Mon, 06 Jul 2009) | 5 lines
Backport r992174 from trunk to 4.3 :
Add the kontact subdir after ktimetracker. Otherwise, BUILD_ktimetracker will always be false when building kontact/plugins.
........
................
r997440 | tmcguire | 2009-07-15 22:28:34 +0200 (Wed, 15 Jul 2009) | 11 lines
Merged revisions 992178 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r992178 | winterz | 2009-07-06 14:41:34 +0200 (Mon, 06 Jul 2009) | 5 lines
backport SVN commit 991853 by pokrzywka:
Windows compatibility: use QUrl::toLocalFile() (which returns "C:/foo") instead of QUrl::path() (which returns "/C:/foo")
........
................
r997446 | tmcguire | 2009-07-15 22:31:14 +0200 (Wed, 15 Jul 2009) | 12 lines
Merged revisions 992426 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r992426 | winterz | 2009-07-06 22:38:01 +0200 (Mon, 06 Jul 2009) | 5 lines
backport SVN commit 992417 by winterz:
crash guard, probably fixes
CCBUG: 199186
........
................
r997450 | tmcguire | 2009-07-15 22:33:05 +0200 (Wed, 15 Jul 2009) | 11 lines
Merged revisions 993745 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r993745 | winterz | 2009-07-09 14:51:01 +0200 (Thu, 09 Jul 2009) | 4 lines
backport SVN commit 993742 by winterz:
Go crazy with node validity checks to try and fix all the crash reports that I can't reproduce.
........
................
r997458 | tmcguire | 2009-07-15 22:34:57 +0200 (Wed, 15 Jul 2009) | 11 lines
Merged revisions 994065 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r994065 | winterz | 2009-07-10 04:22:07 +0200 (Fri, 10 Jul 2009) | 5 lines
backport SVN commit r994063 by winterz:
fix spacing between the pixmap and the urllabel
........
................
r997464 | tmcguire | 2009-07-15 22:38:33 +0200 (Wed, 15 Jul 2009) | 12 lines
Already merged by Allen when he updated libkdepim to 4.3
SVN_SILENT
--
Recorded merge of revisions 994358 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r994358 | ervin | 2009-07-10 16:41:10 +0200 (Fri, 10 Jul 2009) | 2 lines
Backport keyboard input fix from trunk revision 994339.
........
................
r997467 | tmcguire | 2009-07-15 22:43:50 +0200 (Wed, 15 Jul 2009) | 11 lines
Merged revisions 995094 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r995094 | winterz | 2009-07-12 01:06:31 +0200 (Sun, 12 Jul 2009) | 4 lines
backport SVN commit 995092 by winterz:
provide better initial search date range of [Today,A year from Today]
........
................
r997470 | tmcguire | 2009-07-15 22:50:59 +0200 (Wed, 15 Jul 2009) | 11 lines
Merged revisions 995516 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r995516 | winterz | 2009-07-12 23:47:41 +0200 (Sun, 12 Jul 2009) | 4 lines
backport SVN commit 995514 by winterz:
make KMSearchPattern::matches() more robust against crashes.
........
................
r997473 | tmcguire | 2009-07-15 22:54:19 +0200 (Wed, 15 Jul 2009) | 11 lines
Merged revisions 995520 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r995520 | winterz | 2009-07-12 23:56:35 +0200 (Sun, 12 Jul 2009) | 4 lines
backport SVN commit 995517 by winterz:
restore fix for bug 130938 "kmail stops checking local mailbox"
........
................
r997478 | tmcguire | 2009-07-15 23:05:33 +0200 (Wed, 15 Jul 2009) | 14 lines
Merged revisions 996748 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r996748 | winterz | 2009-07-14 22:13:39 +0200 (Tue, 14 Jul 2009) | 7 lines
backport SVN commit 996743 by winterz:
In the search window results list view, make single click on a message put the focus
on that message and make double click open a viewer window for that message.
[Thomas, drat! I forgot to use the backport bash function you gave me.]
........
................
r997479 | tmcguire | 2009-07-15 23:07:16 +0200 (Wed, 15 Jul 2009) | 15 lines
Merged revisions 988351 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r988351 | osterfeld | 2009-06-27 22:57:11 +0200 (Sat, 27 Jun 2009) | 8 lines
disable the configure button also if no backends were added, which happens if the page is selected before the akregator
part is loaded, in kontact.
Prevents a crash when clicking the button in this case.
The actual problem is that we cannot list the plugins without loading them (as all the needed info is in the plugins and not their .desktop files),
and we can load them only if the akregatorpart is loaded.
BUG:195482
........
................
r997481 | tmcguire | 2009-07-15 23:11:45 +0200 (Wed, 15 Jul 2009) | 10 lines
Merged revisions 990398 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r990398 | dfaure | 2009-07-02 15:25:48 +0200 (Thu, 02 Jul 2009) | 3 lines
Backport crash fix for 990394 for KDE-4.3.0
CCBUG: 990394
........
................
r997482 | tmcguire | 2009-07-15 23:15:07 +0200 (Wed, 15 Jul 2009) | 12 lines
Merged revisions 996521 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r996521 | osterfeld | 2009-07-14 16:00:10 +0200 (Tue, 14 Jul 2009) | 6 lines
- Force focus to always reach the articleviewer, even if in subscriptionlist has been clicked, fixes bug 124486
patch by Alexander Elbs
BUG:124486
........
................
r997485 | tmcguire | 2009-07-15 23:22:44 +0200 (Wed, 15 Jul 2009) | 35 lines
Block these Akregator commits, there are simply too many conflicts.
Frank, if you want those commits in e4, you need to merge them yourself.
Thanks.
CCMAIL: frank.osterfeld@kdemail.net
--
Blocked revisions 988358,996500,996539 via svnmerge
........
r988358 | osterfeld | 2009-06-27 23:36:41 +0200 (Sat, 27 Jun 2009) | 3 lines
don't crash when passing feeds to add via cmd line option
BUG:193963
........
r996500 | osterfeld | 2009-07-14 15:52:22 +0200 (Tue, 14 Jul 2009) | 7 lines
forward port from 4.2:
when the next/prev [unread] article/feed actions are triggered, switch back to the article tab so the user action is visible
CCBUG:147700
........
r996539 | osterfeld | 2009-07-14 16:08:16 +0200 (Tue, 14 Jul 2009) | 11 lines
This patch enables ctrl-+ and ctrl-- again to enlarge/shrink the font of the
articleviewer (font != zoom). These two actions are also added to the "View"
menu.
Additionally actions for print (ctrl-p) and copy (ctrl-c) now also work again
with shortcuts and are configurable in the shortcut configuration menu.
Patch by Alexander Elbs
BUG: 163391
........
................
r997502 | tmcguire | 2009-07-15 23:56:25 +0200 (Wed, 15 Jul 2009) | 4 lines
Crossport r987454 by yurchor from trunk to the enterprise4 branch:
Fix typos
................
r997505 | tmcguire | 2009-07-16 00:03:44 +0200 (Thu, 16 Jul 2009) | 4 lines
Fix the GMX export/import by copying over the version from trunk, which has some changes by Urs.
MERGE: none
................
r997510 | tmcguire | 2009-07-16 00:09:04 +0200 (Thu, 16 Jul 2009) | 5 lines
Crossport r988329 by aacid from trunk to the enterprise4 branch:
Fix typos found by Yuri Chornoivan
................
r997512 | tmcguire | 2009-07-16 00:12:27 +0200 (Thu, 16 Jul 2009) | 11 lines
Crossport r990839 by winterz from trunk to the enterprise4 branch:
Change the button text on the Account Wizard from "Cancel" to "Create an Account Later".
Patch from Joe Burns. Thanks! and keep them coming :)
http://reviewboard.kde.org/r/824
MERGE: e4
................
r997523 | tmcguire | 2009-07-16 00:27:18 +0200 (Thu, 16 Jul 2009) | 16 lines
Merged revisions 997519 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r997519 | tmcguire | 2009-07-16 00:20:11 +0200 (Thu, 16 Jul 2009) | 10 lines
Backport r992136 by tmcguire from trunk to the 4.3 branch:
Fix sending of UTF-16 messages: Don't try to read the header fields as UTF-16, which
corrupts them.
Also, make the source viewer really show the source, don't try to encode it.
kolab/issue3707
........
................
r997532 | tmcguire | 2009-07-16 00:52:35 +0200 (Thu, 16 Jul 2009) | 9 lines
Crossport r997204 by mlaurent from trunk to the enterprise4 branch:
Fix kolab issue 3739
(Inform when we use a distribution list empty)
and fix duplication code.
................
r997533 | tmcguire | 2009-07-16 01:02:19 +0200 (Thu, 16 Jul 2009) | 16 lines
Crossport r988287 by smartins from trunk to the enterprise4 branch:
Show a message if a user tries to use work week view without configuring work days.
and:
s/Working Hours/Working Period in the prefs
DO-NOT-BACKPORT
MERGE: e4
CCBUG: 192239
................
r997534 | tmcguire | 2009-07-16 01:03:24 +0200 (Thu, 16 Jul 2009) | 8 lines
Crossport r991078 by winterz from trunk to the enterprise4 branch:
provide a messagebox::sorry if pasting failed because we were unable to determine
a valid target date.
DO_NOT_BACKPORT:
MERGE: e4
................
r997535 | tmcguire | 2009-07-16 01:04:10 +0200 (Thu, 16 Jul 2009) | 9 lines
Crossport r991194 by winterz from trunk to the enterprise4 branch:
provide a nicer "do you want to delete filter" dialog.
KUIT
DO_NOT_BACKPORT:
MERGE: e4
................
r997537 | tmcguire | 2009-07-16 01:05:09 +0200 (Thu, 16 Jul 2009) | 7 lines
Crossport r991410 by winterz from trunk to the enterprise4 branch:
fix typo in the "do you want to permanently remove..." question
DO_NOT_BACKPORT:
MERGE: e4
................
r997538 | tmcguire | 2009-07-16 01:05:56 +0200 (Thu, 16 Jul 2009) | 9 lines
Crossport r991610 by winterz from trunk to the enterprise4 branch:
when deleting an item, don't tell the user that we will delete; instead ask the user
if delete is ok.
DO_NOT_BACKPORT:
MERGE: e4
................
r997541 | tmcguire | 2009-07-16 01:13:15 +0200 (Thu, 16 Jul 2009) | 11 lines
Merged revisions 996838 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r996838 | winterz | 2009-07-15 02:14:41 +0200 (Wed, 15 Jul 2009) | 4 lines
backport SVN commit 996837 by winterz:
fix a crash when applying filters in to-do view.
........
................
r997544 | tmcguire | 2009-07-16 01:20:59 +0200 (Thu, 16 Jul 2009) | 9 lines
Merged revisions 997078 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r997078 | mlaurent | 2009-07-15 12:21:31 +0200 (Wed, 15 Jul 2009) | 2 lines
Backport fix kolab issue3696
........
................
r997547 | tmcguire | 2009-07-16 01:23:58 +0200 (Thu, 16 Jul 2009) | 11 lines
Merged revisions 997159 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r997159 | mlaurent | 2009-07-15 14:57:42 +0200 (Wed, 15 Jul 2009) | 5 lines
Backport:
Fix enable/disable action when we don't have select email
and we call select all
........
................
r997934 | winterz | 2009-07-16 19:00:49 +0200 (Thu, 16 Jul 2009) | 4 lines
merge SVN commits r995364 and r995420 by winterz:
................
r998148 | winterz | 2009-07-17 03:25:10 +0200 (Fri, 17 Jul 2009) | 14 lines
Blocked revisions 998147 via svnmerge
........
r998147 | winterz | 2009-07-16 21:23:55 -0400 (Thu, 16 Jul 2009) | 8 lines
When fixing "Crash in KMFolder::trashFolder at kmfolder.cpp:811 while deletion of an
attachment in an encapsuled message", must also remember to set the destination
folder to 0, else we still crash.
kolab/issue3740
MERGE: none (not needed in e4 either)
........
................
r998231 | tmcguire | 2009-07-17 11:00:53 +0200 (Fri, 17 Jul 2009) | 21 lines
Already merged by Allen :)
SVN_SILENT
--
Recorded merge of revisions 995364,995420 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
........
r995364 | winterz | 2009-07-12 16:19:46 +0200 (Sun, 12 Jul 2009) | 4 lines
backport SVN commit 995231 by winterz:
fix the layout of the search dialog.
........
r995420 | winterz | 2009-07-12 19:30:17 +0200 (Sun, 12 Jul 2009) | 5 lines
backport SVN commit 995418 by winterz:
oopsie, mistakenly removed the results frame. might be nice to actually see
the results of the search, huh?
........
................
r998236 | tmcguire | 2009-07-17 11:11:52 +0200 (Fri, 17 Jul 2009) | 16 lines
Revert the following commit, as Allen says it breaks things for him.
------------------------------------------------------------------------
r997532 | tmcguire | 2009-07-16 00:52:35 +0200 (Thu, 16 Jul 2009) | 9 lines
Crossport r997204 by mlaurent from trunk to the enterprise4 branch:
Fix kolab issue 3739
(Inform when we use a distribution list empty)
and fix duplication code.
------------------------------------------------------------------------
................
r998282 | tmcguire | 2009-07-17 13:27:01 +0200 (Fri, 17 Jul 2009) | 1 line
Update NewsLog.txt
................
r998285 | tmcguire | 2009-07-17 13:28:29 +0200 (Fri, 17 Jul 2009) | 1 line
SVN_SILENT Update version numbers for today's release.
................
r998302 | winterz | 2009-07-17 13:40:50 +0200 (Fri, 17 Jul 2009) | 12 lines
Blocked revisions 998277,998284 via svnmerge
........
r998277 | tmcguire | 2009-07-17 07:08:15 -0400 (Fri, 17 Jul 2009) | 1 line
Update NewsLog.txt
........
r998284 | tmcguire | 2009-07-17 07:28:27 -0400 (Fri, 17 Jul 2009) | 1 line
SVN_SILENT Update version numbers for today's release.
........
................
r998340 | winterz | 2009-07-17 15:18:47 +0200 (Fri, 17 Jul 2009) | 8 lines
Blocked revisions 997707 via svnmerge
........
r997707 | ludwigreiter | 2009-07-16 07:26:55 -0400 (Thu, 16 Jul 2009) | 2 lines
removed non-fixed issues.
........
................................
r1000886 | tmcguire | 2009-07-22 11:18:48 +0200 (Wed, 22 Jul 2009) | 10 lines Merged revisions 998025 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r998025 | winterz | 2009-07-16 22:58:08 +0200 (Thu, 16 Jul 2009) | 3 lines oops! I did it again. Don't use CamelCase headers since we don't support them yet. ........
................
r1000887 | tmcguire | 2009-07-22 11:20:58 +0200 (Wed, 22 Jul 2009) | 21 lines
Cyclic merge, block it.
SVN_SILENT
SVN_MERGE
--
Blocked revisions 998369 via svnmerge
................
r998369 | winterz | 2009-07-17 16:34:37 +0200 (Fri, 17 Jul 2009) | 11 lines
Merged revisions 998346 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r998346 | winterz | 2009-07-17 09:51:41 -0400 (Fri, 17 Jul 2009) | 5 lines
backport SVN commit 998252 by amantia:
Another solution for don't show "too many recipients" warning for invitation mails (thanks to Thomas). Fixes kolab/issue3718.
........
................................
r1000891 | tmcguire | 2009-07-22 11:35:07 +0200 (Wed, 22 Jul 2009) | 13 lines SVN_MERGE Merged revisions 998459 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim ........ r998459 | winterz | 2009-07-17 19:38:03 +0200 (Fri, 17 Jul 2009) | 5 lines use @info:status instead of @info:tooltip for the systray tooltip. else, we get richtext for the systray tooltip which doesn't work well in Windows. MERGE: trunk,4.3 ........
................
r1000895 | tmcguire | 2009-07-22 11:38:26 +0200 (Wed, 22 Jul 2009) | 21 lines
SVN_MERGE
Merged revisions 999842 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r999842 | winterz | 2009-07-20 16:08:49 +0200 (Mon, 20 Jul 2009) | 13 lines
Merged revisions 999834 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r999834 | winterz | 2009-07-20 10:06:02 -0400 (Mon, 20 Jul 2009) | 6 lines
support status "needs-action", even though this is not according to spec.
apparently Kolab 2.2.0 sets it anyway. so let's be nice about it.
should fix kolab/issue3766
MERGE: e4,trunk,4.3
........
................................
r1000898 | tmcguire | 2009-07-22 11:41:35 +0200 (Wed, 22 Jul 2009) | 21 lines
SVN_MERGE
Merged revisions 1000512 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r1000512 | winterz | 2009-07-21 15:39:07 +0200 (Tue, 21 Jul 2009) | 13 lines
Merged revisions 1000510 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1000510 | winterz | 2009-07-21 09:30:54 -0400 (Tue, 21 Jul 2009) | 6 lines
add status "needs-action" to a blacklist of unknown statuses, thereby reverting
my former idea that we should all it.
kolab/issue3766
MERGE: e4,trunk,4.3
........
................................
r1000999 | ervin | 2009-07-22 14:58:15 +0200 (Wed, 22 Jul 2009) | 3 lines Add a FavoriteCollectionsView. Borrow quite some code from EntityTreeView. We might want to improve the code sharing there.
................
r1001001 | ervin | 2009-07-22 14:59:03 +0200 (Wed, 22 Jul 2009) | 4 lines Use the new FavoriteCollectionsView. Dissociate the context menus so that we show only the actions which make sense in the favorites list view of in the collection tree view.
................
r1001137 | winterz | 2009-07-22 18:14:10 +0200 (Wed, 22 Jul 2009) | 5 lines add context for the "do you really want to delete queries" and also change the questions a bit. as requested by icwiener.
................
r1001203 | jtamate | 2009-07-22 19:04:42 +0200 (Wed, 22 Jul 2009) | 3 lines BUG: 78712 Do not append a newline if the content-disposition mode already contains a newline.
................
r1001256 | mlaurent | 2009-07-22 21:12:55 +0200 (Wed, 22 Jul 2009) | 2 lines Fix compile
................
r1001261 | mlaurent | 2009-07-22 21:14:56 +0200 (Wed, 22 Jul 2009) | 2 lines Compile here too
................
r1001263 | mlaurent | 2009-07-22 21:18:47 +0200 (Wed, 22 Jul 2009) | 2 lines Make it compile
................
r1001329 | djarvie | 2009-07-23 00:18:25 +0200 (Thu, 23 Jul 2009) | 2 lines Use new setting after "prompt for calendar to store in" selection changes.
................
r1001364 | mleupold | 2009-07-23 03:20:38 +0200 (Thu, 23 Jul 2009) | 1 line Fix KMail krazy2 crashy issues using a private copy of kalarm/lib/autoqpointer.h
................
r1001498 | winterz | 2009-07-23 15:28:51 +0200 (Thu, 23 Jul 2009) | 6 lines fix the fix of the fix for Do not append a newline if the content-disposition mode already contains a newline. CCBUG: 78712 CCMAIL: jtamate@gmail.com
................
r1001525 | vkrause | 2009-07-23 17:02:02 +0200 (Thu, 23 Jul 2009) | 5 lines Remove some old hacks and replace some strings with proper constants. As a side-effect this removes a rather expensive full collection listing as part of every single folder sync.
................
r1001529 | vkrause | 2009-07-23 17:22:15 +0200 (Thu, 23 Jul 2009) | 3 lines Crash guard if we are not connected yet, add error message for that case and try to reconnect.
................
r1001541 | vkrause | 2009-07-23 17:34:05 +0200 (Thu, 23 Jul 2009) | 3 lines Improve user feedback. Also store the config immediately after editing so nothing gets lost in the increasingly unlikely case of a crash.
................
r1001545 | vkrause | 2009-07-23 17:42:48 +0200 (Thu, 23 Jul 2009) | 2 lines oops, unbreak incremental sync
................
r1001553 | vkrause | 2009-07-23 18:06:02 +0200 (Thu, 23 Jul 2009) | 5 lines Simplify attribute handling and only run the modify jobs if something actually changed (which we were checking anyway already). Reduces the number of Akonadi operations during a sync without any remote changes by about 60%.
................
r1001599 | djarvie | 2009-07-23 20:30:36 +0200 (Thu, 23 Jul 2009) | 2 lines Bug 198072: sort alarm list after an alarm triggers.
................
r1001666 | djarvie | 2009-07-23 23:54:41 +0200 (Thu, 23 Jul 2009) | 2 lines Display translated time zone names in time zone selection combo box.
................
r1001795 | lueck | 2009-07-24 11:38:29 +0200 (Fri, 24 Jul 2009) | 1 line needs double ampersand to be displayed as single one
................
r1001874 | skelly | 2009-07-24 14:00:56 +0200 (Fri, 24 Jul 2009) | 1 line Commit the AkonadiBrowserModel. Not used yet.
................
r1001888 | tmcguire | 2009-07-24 14:35:32 +0200 (Fri, 24 Jul 2009) | 1 line warnings-- (I guess the kDebug #define in kdelibs was changed)
................
r1001895 | skelly | 2009-07-24 15:02:20 +0200 (Fri, 24 Jul 2009) | 1 line Rename getNumColumns to getColumnCount.
................
r1001898 | tmcguire | 2009-07-24 15:09:42 +0200 (Fri, 24 Jul 2009) | 3 lines Use kError() instead of perror(). warnings--
................
r1001922 | jarmond | 2009-07-24 16:05:14 +0200 (Fri, 24 Jul 2009) | 6 lines Reapply template on switching identity in composer. Respect custom templates when forwarding inline. BUG: 143199 BUG: 179754 BUG: 186843
................
r1001926 | jarmond | 2009-07-24 16:17:43 +0200 (Fri, 24 Jul 2009) | 1 line Remove duplicate include.
................
r1001927 | skelly | 2009-07-24 16:18:49 +0200 (Fri, 24 Jul 2009) | 1 line Add workarounds for emitting beginResetModel before resetting, and endResetModel after resetting.
................
r1001928 | skelly | 2009-07-24 16:18:59 +0200 (Fri, 24 Jul 2009) | 3 lines Port the AkonadiConsole to EntityTreeModel and proxies. Will get more improvements later such as something sensible in the itemView when the mimetype doesn't match the context.
................
r1001946 | winterz | 2009-07-24 17:25:59 +0200 (Fri, 24 Jul 2009) | 8 lines Make the Kontact summary view uses view text color instead of window text color. Thanks for the patch Peter. also be nicer to the rightToLeft folks with the stylesheet. BUG: 201218 MERGE: 4.3,e4
................
r1001957 | lueck | 2009-07-24 17:52:07 +0200 (Fri, 24 Jul 2009) | 1 line forward port from branch r1001956: fix i18n bug ande translated names in the template dialog
................
r1002046 | djarvie | 2009-07-24 22:32:41 +0200 (Fri, 24 Jul 2009) | 1 line Fix error warning colour
................
r1002059 | winterz | 2009-07-24 22:53:46 +0200 (Fri, 24 Jul 2009) | 3 lines sorry danimo, but I like the big, fat, header titles with the window color background. MERGE: e4,4.3
................
r1002081 | tmcguire | 2009-07-24 23:27:27 +0200 (Fri, 24 Jul 2009) | 6 lines Unify the options for the folder and the message list tooltip. Patch by James Bendig <james at imptalk dot com>, thank you! http://reviewboard.kde.org/r/1105
................
r1002105 | jarmond | 2009-07-25 01:38:55 +0200 (Sat, 25 Jul 2009) | 8 lines Use correct quote prefix when replying, respecting global and identity settings. Also move formatString from kmmessage.cpp to stringutil.cpp Also create TemplatesConfiguration::configIdString function for obtaining custom template identifier. BUG: 182911
................
r1002178 | scripty | 2009-07-25 12:02:27 +0200 (Sat, 25 Jul 2009) | 1 line SVN_SILENT made messages (.desktop file)
................
r1002191 | jtamate | 2009-07-25 12:31:05 +0200 (Sat, 25 Jul 2009) | 3 lines Fixes a memory leak of 5,956,964 (72 direct, 5,956,892 indirect) bytes. tested with valgrind.
................
r1002192 | tmcguire | 2009-07-25 12:32:32 +0200 (Sat, 25 Jul 2009) | 1 line warnings--
................
r1002193 | tmcguire | 2009-07-25 12:38:38 +0200 (Sat, 25 Jul 2009) | 1 line SVN_SILENT minor whitespace changes in kdebug() calls, where the original conversion screwed up.
................
r1002295 | djarvie | 2009-07-25 17:46:30 +0200 (Sat, 25 Jul 2009) | 4 lines Refactor ICalResource to provide an ICalResourceBase class suitable for inheritance by KAlarm's resource, and to separate out the KNotes resource into a separate NotesResource class. See http://reviewboard.kde.org/r/1057.
................
r1002343 | tmcguire | 2009-07-25 20:08:32 +0200 (Sat, 25 Jul 2009) | 4 lines Add a bunch of people to the about dialog. Please tell me if I still missed someone.
................
r1002356 | bbigras | 2009-07-25 20:53:44 +0200 (Sat, 25 Jul 2009) | 5 lines Add support to filter outgoing message before they are sent based on a commit from Christian Schaarschmidt on the kdepim-3.5.5+ branch BUG: 48938 CCMAIL: exit3219@gmail.com
................
r1002413 | tmcguire | 2009-07-26 00:37:38 +0200 (Sun, 26 Jul 2009) | 3 lines Also color quoted lines in HTML messages. This makes reading HTML mail much more pleasing.
................
r1002444 | tmcguire | 2009-07-26 02:48:29 +0200 (Sun, 26 Jul 2009) | 1 line Commit missing changes from my previous commit.
................
r1002525 | jarmond | 2009-07-26 11:57:07 +0200 (Sun, 26 Jul 2009) | 4 lines Enable search by status. BUG: 180819 MERGE: 4.3
................
r1002617 | pokrzywka | 2009-07-26 17:06:12 +0200 (Sun, 26 Jul 2009) | 2 lines KMail/win32 crash on too many open files - fix part 1: fix a memory access violation caused by the stale rdict pointer in the storage.
................
r1002618 | ahartmetz | 2009-07-26 17:07:31 +0200 (Sun, 26 Jul 2009) | 1 line link with gold
................
r1002657 | djarvie | 2009-07-26 19:56:38 +0200 (Sun, 26 Jul 2009) | 2 lines Bug 194421: Prompt whether to set defaults for all tabs or just current tab
................
r1002672 | djarvie | 2009-07-26 21:09:54 +0200 (Sun, 26 Jul 2009) | 1 line Fix resetting defaults for current tab only
................
r1002675 | djarvie | 2009-07-26 21:19:11 +0200 (Sun, 26 Jul 2009) | 2 lines Make the Defaults button in configuration dialogue set the correct default values.
................
r1002770 | tmcguire | 2009-07-27 00:35:50 +0200 (Mon, 27 Jul 2009) | 8 lines Also support multipart/alternative with text/plain and multipart/related as children, instead of the usual text/plain and text/html. This fixes that the content of some Newsletters with images was rendered twice, bot the HTML and the plain text part was shown. BUG: 187989
................
r1002846 | smartins | 2009-07-27 08:25:33 +0200 (Mon, 27 Jul 2009) | 6 lines The start and end KDateTimes that are passed to Recurrence::timesInInterval(...) must have a time, so comparing with < and > work as we want BUG: 199116 MERGE: e4
................
svn path=/branches/work/akonadi-ports/kdepim/; revision=1002889