That's KMail1 legacy code, folders should be addressed either using
Akonadi::Collection or Akonadi::Collection::Id.
Also add some todos for getting FolderRequester into libakonadi.
Using QTextEdit instead of QLabel as QTextEdit has scrollbar and QLabel does not,
this could made part of the text in the Anti-Virus assitant unreadable if font
size if big.
REVIEW: 101824
They would match every single mail, and move it to the trash, ouch.
Solution: when the wizard shows "no tools found", skip all other pages
and offer "Finish" right away. For future-proofness, I also disabled
the checkboxes on the 2nd page, in case one day this page is used for more
(e.g. for disabling spam handling again)
FIXED-IN: 4.6
BUG: 260351
Merged revisions 1140352,1140363,1140386,1140420,1140424,1140427,1140448-1140449,1140453-1140456,1140478,1140545-1140546,1140627,1140629,1140631,1140635,1140652-1140653,1140665,1140677,1140691,1140695-1140696,1140703-1140704 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1140352 | winterz | 2010-06-20 15:27:15 +0200 (Sun, 20 Jun 2010) | 6 lines
foward port SVN commit 1139654 by winterz from 4.4 branch:
when checking the mimetype from the TransferJob, make sure to also look for
mimetype aliases (per dfaure) and then be careful still about 0 KMimeType::Ptr's.
CCBUG: 228644
................
r1140363 | mlaurent | 2010-06-20 16:02:13 +0200 (Sun, 20 Jun 2010) | 2 lines
Try to migrate type of folder
................
r1140386 | tokoe | 2010-06-20 16:37:29 +0200 (Sun, 20 Jun 2010) | 4 lines
Use Akonadi item instead of 'konsole' icon to avoid confusion
BUG: 214825
................
r1140420 | mlaurent | 2010-06-20 19:00:16 +0200 (Sun, 20 Jun 2010) | 2 lines
It's hasEntry not hasGroup
................
r1140424 | mlaurent | 2010-06-20 19:05:44 +0200 (Sun, 20 Jun 2010) | 2 lines
Remove duplicate code
................
r1140427 | mlaurent | 2010-06-20 19:16:17 +0200 (Sun, 20 Jun 2010) | 2 lines
Not necessary
................
r1140448 | krake | 2010-06-20 20:31:51 +0200 (Sun, 20 Jun 2010) | 2 lines
Fix intentations
................
r1140449 | krake | 2010-06-20 20:32:27 +0200 (Sun, 20 Jun 2010) | 2 lines
Disable verbose single item debug output
................
r1140453 | tilladam | 2010-06-20 20:54:32 +0200 (Sun, 20 Jun 2010) | 7 lines
Handle (re)connects via task scheduler special tasks.
Use a special task in the taskscheduler, prepended to all queues,
to model that login needs to succeed before anything else can proceed.
This allows handling transient errors with automatic reconnects while
still allowing permanent (configuration) problems to cause the resource
to go offline explictely and block further processing.
................
r1140454 | tilladam | 2010-06-20 20:54:34 +0200 (Sun, 20 Jun 2010) | 2 lines
Make sure to complete the extra info jobs even if the server doesn't
support any of the extra info capabilities.
................
r1140455 | tilladam | 2010-06-20 20:54:36 +0200 (Sun, 20 Jun 2010) | 2 lines
Make sure to fetch the error attribute as well, when the monitor
notifies us of changes.
................
r1140456 | tilladam | 2010-06-20 20:54:38 +0200 (Sun, 20 Jun 2010) | 1 line
Reset the messageviewer when the item it is showing goes away.
................
r1140478 | krake | 2010-06-20 22:08:28 +0200 (Sun, 20 Jun 2010) | 3 lines
When doing a local import of DIMAP cache, either because IMAP import failed or because it was explicitly requested, do it like a migration task.
I.e. defer migrateNext() after import, show progress on import, etc.
................
r1140545 | winterz | 2010-06-21 00:00:20 +0200 (Mon, 21 Jun 2010) | 5 lines
merge forward SVN commit 1138403 by winterz:
another attempt at making sure this dialog always shows on top
kolab/issue4405
................
r1140546 | winterz | 2010-06-21 00:01:36 +0200 (Mon, 21 Jun 2010) | 12 lines
SVN_SILENT:
Recorded merge of revisions 1138403 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1138403 | winterz | 2010-06-15 19:29:52 -0400 (Tue, 15 Jun 2010) | 4 lines
another attempt at making sure this dialog always shows on top
kolab/issue4405
MERGE: trunk
........
................
r1140627 | pino | 2010-06-21 10:14:49 +0200 (Mon, 21 Jun 2010) | 2 lines
use QString::fromLatin1() to compile without cast from ascii enabled
................
r1140629 | ervin | 2010-06-21 10:18:18 +0200 (Mon, 21 Jun 2010) | 2 lines
Make extra sure we had attributes and then a job created.
................
r1140631 | ervin | 2010-06-21 10:22:56 +0200 (Mon, 21 Jun 2010) | 2 lines
Give a chance to the next part even if we had no annotations.
................
r1140635 | ervin | 2010-06-21 10:40:37 +0200 (Mon, 21 Jun 2010) | 3 lines
Initialized merge tracking via "svnmerge" with revisions "1-1127090" from
svn+ssh://ervin@svn.kde.org/home/kde/branches/work/~ervin/imap-resource-refactor
................
r1140652 | smartins | 2010-06-21 11:20:48 +0200 (Mon, 21 Jun 2010) | 11 lines
SVN_SILENT:
Blocked revisions 1140650 via svnmerge
........
r1140650 | smartins | 2010-06-21 09:19:36 +0000 (Mon, 21 Jun 2010) | 4 lines
Backport r1140155 by smartins from branch 4.4 to e35:
Crash even less.
........
................
r1140653 | ervin | 2010-06-21 11:21:22 +0200 (Mon, 21 Jun 2010) | 111 lines
Merged revisions 1127167,1130767,1131052,1131077,1138170,1138679,1138724,1138728-1138730,1138732-1138733,1138736,1138738-1138739,1138742,1139055,1139058,1139061,1139074,1139084 via svnmerge from
svn+ssh://ervin@svn.kde.org/home/kde/branches/work/~ervin/imap-resource-refactor
........
r1127167 | ervin | 2010-05-15 18:57:07 +0200 (Sat, 15 May 2010) | 2 lines
Get the settings loading logic outside of ImapAccount.
........
r1130767 | ervin | 2010-05-26 11:39:15 +0200 (Wed, 26 May 2010) | 2 lines
Be less chatty about the flags.
........
r1131052 | ervin | 2010-05-27 08:07:37 +0200 (Thu, 27 May 2010) | 3 lines
Move the password requesting logic in its own class. Much more readable
this way, and improve modularity which will help unit testing.
........
r1131077 | ervin | 2010-05-27 09:58:36 +0200 (Thu, 27 May 2010) | 3 lines
Move the Settings->ImapAccount loading out of the resource itself.
Settings provides this service now.
........
r1138170 | ervin | 2010-06-15 11:15:06 +0200 (Tue, 15 Jun 2010) | 2 lines
Header cleanup.
........
r1138679 | ervin | 2010-06-16 15:36:44 +0200 (Wed, 16 Jun 2010) | 2 lines
Fix enum declaration.
........
r1138724 | ervin | 2010-06-16 17:34:58 +0200 (Wed, 16 Jun 2010) | 2 lines
Separate SessionUiProxy so that it can be used in several places.
........
r1138728 | ervin | 2010-06-16 17:37:07 +0200 (Wed, 16 Jun 2010) | 9 lines
Add a SessionPool class which has the responsibility of creating the
sessions up to the point where they're authenticated. Client code can
request a session to do its job, and release it once its done in order
to reuse it.
Released sessions are not closed, so that we don't need to pay the
authentication price if some session is released and already ready.
........
r1138729 | ervin | 2010-06-16 17:38:17 +0200 (Wed, 16 Jun 2010) | 4 lines
Build the session pool and its tests. Also split the resource into a
static lib and the resource itself to make it easier to link to the
relevant parts for the tests.
........
r1138730 | ervin | 2010-06-16 17:40:08 +0200 (Wed, 16 Jun 2010) | 6 lines
Make it slightly lower level and let the subscription dialog do its own
authentication. No need to go through ImapAccount to authenticate.
Slight duplication of code, but definitely more readable and less black
magic this way. Also we don't want this dialog to eat a slot in our
session pool.
........
r1138732 | ervin | 2010-06-16 17:40:48 +0200 (Wed, 16 Jun 2010) | 2 lines
Port to the subscription dialog changes.
........
r1138733 | ervin | 2010-06-16 17:41:26 +0200 (Wed, 16 Jun 2010) | 2 lines
Port to the new SessionPool.
........
r1138736 | ervin | 2010-06-16 17:42:15 +0200 (Wed, 16 Jun 2010) | 4 lines
No need to manage sessions into ImapAccount anymore.
ImapAccount now does only one thing: carry the info about an account
(password excluded).
........
r1138738 | ervin | 2010-06-16 17:48:51 +0200 (Wed, 16 Jun 2010) | 2 lines
The session pool now takes ownership of the given ImapAccount.
........
r1138739 | ervin | 2010-06-16 17:40:45 +0200 (Wed, 16 Jun 2010) | 3 lines
Finish cleaning up ImapAccount which doesn't need to be a QObject
anymore.
........
r1138742 | ervin | 2010-06-16 17:57:25 +0200 (Wed, 16 Jun 2010) | 3 lines
Even better, make sure the session pool disconnects everything when
deleted.
........
r1139055 | ervin | 2010-06-17 09:41:01 +0200 (Thu, 17 Jun 2010) | 2 lines
--warnings
........
r1139058 | ervin | 2010-06-17 10:05:11 +0200 (Thu, 17 Jun 2010) | 3 lines
Don't release the session in this case, as we forcibly killed them all
anyway by calling disconnect() on the pool.
........
r1139061 | ervin | 2010-06-17 10:24:18 +0200 (Thu, 17 Jun 2010) | 4 lines
Emit the configuration accepted signal earlier, the reconnect()
apparently sometimes delays its emission too much to the point where a
d-bus timeout hits.
........
r1139074 | ervin | 2010-06-17 11:17:17 +0200 (Thu, 17 Jun 2010) | 2 lines
Make use of the shared pointer for ui proxies.
........
r1139084 | ervin | 2010-06-17 11:42:16 +0200 (Thu, 17 Jun 2010) | 3 lines
Consistently use the shared pointer, and sync with the namespace change
of the shared pointer type.
........
................
r1140665 | smartins | 2010-06-21 11:45:37 +0200 (Mon, 21 Jun 2010) | 16 lines
SVN_MERGE:
Merged revisions 1140662 via svnmerge from
svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1140662 | smartins | 2010-06-21 09:38:16 +0000 (Mon, 21 Jun 2010) | 8 lines
Fixed some unitentional fallthroughs on monthly and yearly recurence.
Also added some breaks for readability (didn't falthrough here due to returns, but wasn't explicit)
Fix compiler warning about function not returning.
MERGE: trunk
........
................
r1140677 | mlaurent | 2010-06-21 11:59:21 +0200 (Mon, 21 Jun 2010) | 2 lines
not necessary to display quota page when quota max value == 0
................
r1140691 | smartins | 2010-06-21 12:21:34 +0200 (Mon, 21 Jun 2010) | 10 lines
SVN_MERGE:
Merged revisions 1131292 via svnmerge from
svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1131292 | smartins | 2010-05-27 23:45:12 +0000 (Thu, 27 May 2010) | 2 lines
Use column names instead of numbers for readability
........
................
r1140695 | smartins | 2010-06-21 12:26:15 +0200 (Mon, 21 Jun 2010) | 10 lines
SVN_SILENT:
Recorded merge of revisions 1131292 via svnmerge from
svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1131292 | smartins | 2010-05-27 23:45:12 +0000 (Thu, 27 May 2010) | 2 lines
Use column names instead of numbers for readability
........
................
r1140696 | skelly | 2010-06-21 12:27:56 +0200 (Mon, 21 Jun 2010) | 3 lines
Update the config that the migration succeeded, even if it didn't.
Workaround for inexplicable bug.
................
r1140703 | mlaurent | 2010-06-21 12:34:09 +0200 (Mon, 21 Jun 2010) | 2 lines
Add readablecollectionproxymodel options
................
r1140704 | smartins | 2010-06-21 12:30:59 +0200 (Mon, 21 Jun 2010) | 2 lines
currentDateCount() and maxDatesHint() are now const.
................
svn path=/branches/work/komo/kdepim/; revision=1140726
Merged revisions 1129080,1129082-1129083,1129088,1129139,1129149,1129184-1129185,1129190,1129206,1129210,1129212,1129226,1129232-1129233,1129257-1129258,1129384,1129486,1129520,1129689,1129745,1129819,1129823,1130073,1130076,1130090,1130092,1130094,1130125,1130127,1130136,1130145-1130146,1130159,1130172-1130174,1130231,1130236-1130237,1130261,1130270 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1129080 | smartins | 2010-05-21 11:50:29 +0200 (Fri, 21 May 2010) | 17 lines
Forward port from e35:
SVN commit 1128862 by tmcguire:
Make sure all day labels are of the same type.
Also, fix the long day label, it did never work because
of a faulty setText() reimplementation.
kolab/issue4286
---
SVN commit 1128886 by tmcguire:
Don't forget to call the base class' implementation.
................
r1129082 | smartins | 2010-05-21 11:59:56 +0200 (Fri, 21 May 2010) | 4 lines
port r1128986 by kainhofe:
KOrganizer's Birthdays: Fix leap year glitch when calculating bdays / anniversaries
................
r1129083 | tilladam | 2010-05-21 12:09:00 +0200 (Fri, 21 May 2010) | 2 lines
Make sure to go online again (at the resourcebase level) when we have
succesfully connected.
................
r1129088 | amantia | 2010-05-21 12:15:37 +0200 (Fri, 21 May 2010) | 1 line
Check if a message is in the outbox folder. If it is, don't remove the encryption when viewing it.
................
r1129139 | winterz | 2010-05-21 13:35:05 +0200 (Fri, 21 May 2010) | 13 lines
SVN_SILENT:
Blocked revisions 1129102,1129109 via svnmerge
........
r1129102 | tmcguire | 2010-05-21 06:48:20 -0400 (Fri, 21 May 2010) | 1 line
Update Newslog.txt
........
r1129109 | tmcguire | 2010-05-21 07:06:38 -0400 (Fri, 21 May 2010) | 1 line
SVN_SILENT Update version numbers for today's release.
........
................
r1129149 | smartins | 2010-05-21 14:07:58 +0200 (Fri, 21 May 2010) | 2 lines
Lots of stuff went into a private class inside .cpp file , so remove fwd declarations from .h .
................
r1129184 | amantia | 2010-05-21 16:50:22 +0200 (Fri, 21 May 2010) | 1 line
Return the top node if an empty url is passed, as ContentIndex::toString() for topLevel returns an empty string . Fixes invitation handling buttons.
................
r1129185 | krake | 2010-05-21 16:56:55 +0200 (Fri, 21 May 2010) | 2 lines
Add accessors for taglist
................
r1129190 | krake | 2010-05-21 16:58:12 +0200 (Fri, 21 May 2010) | 2 lines
When listing items of a collection, check for tags and set them in the job as a custom property
................
r1129206 | amantia | 2010-05-21 17:44:28 +0200 (Fri, 21 May 2010) | 1 line
Don't append the ical file twice to the response mails. Fix exchange compatible response, so they look lik in KMail1,
................
r1129210 | krake | 2010-05-21 18:05:58 +0200 (Fri, 21 May 2010) | 2 lines
Migrate message tag properties
................
r1129212 | smartins | 2010-05-21 18:18:01 +0200 (Fri, 21 May 2010) | 2 lines
Fix broken connect
................
r1129226 | krake | 2010-05-21 19:21:21 +0200 (Fri, 21 May 2010) | 2 lines
Recover tags for cached messages
................
r1129232 | krake | 2010-05-21 20:00:00 +0200 (Fri, 21 May 2010) | 2 lines
Only migrate tags we haven't migrated before
................
r1129233 | krake | 2010-05-21 20:00:23 +0200 (Fri, 21 May 2010) | 2 lines
Enable cache recovery
................
r1129257 | dfaure | 2010-05-21 21:06:13 +0200 (Fri, 21 May 2010) | 2 lines
make the kWarning more explicit about which attribute is actually missing
................
r1129258 | bbroeksema | 2010-05-21 21:08:06 +0200 (Fri, 21 May 2010) | 1 line
Disable IncidenceEditor-ng code in trunk for now
................
r1129384 | tokoe | 2010-05-22 08:47:07 +0200 (Sat, 22 May 2010) | 2 lines
Use explicit type to allow static code checking
................
r1129486 | smartins | 2010-05-22 17:01:23 +0200 (Sat, 22 May 2010) | 5 lines
Don't write back remote revision since we can't make sure it is the current one fixes problems with DAV resource.
Thanks tokoe.
................
r1129520 | smartins | 2010-05-22 20:18:30 +0200 (Sat, 22 May 2010) | 9 lines
Fix segfaults when history entries contain to-dos with references to deleted children.
The crash happens because a clone()d parent still has relations. If you have Parent1 with Child1, and do a Parent1.clone(), the clone will think
that Child1 is his child, but the child doesn't know the clone, so will never notify it when it gets deleted.
This could be fixed in KCal, i think either the clone has 0 relations or we clone the whole family recursively, currently we have an inbetween approach.
................
r1129689 | tilladam | 2010-05-23 13:10:04 +0200 (Sun, 23 May 2010) | 1 line
Don't delete the kernel's identity manager. Off by not.
................
r1129745 | otrichet | 2010-05-23 17:48:45 +0200 (Sun, 23 May 2010) | 4 lines
In the group view, force the default column to sort by.
Forward port to trunk: Group order confusing after adding new groups
CCBUG: 232494
................
r1129819 | smartins | 2010-05-23 23:11:04 +0200 (Sun, 23 May 2010) | 2 lines
Don't cache invalid dates
................
r1129823 | smartins | 2010-05-23 23:25:20 +0200 (Sun, 23 May 2010) | 4 lines
When the parent arrives, tell the orphan children.
Fixes todos sometimes appearing as independent instead of under a parent.
................
r1130073 | mlaurent | 2010-05-24 13:37:57 +0200 (Mon, 24 May 2010) | 2 lines
not necessary to show collection location when it's a search folder
................
r1130076 | winterz | 2010-05-24 13:45:02 +0200 (Mon, 24 May 2010) | 11 lines
SVN_SILENT:
Recorded merge of revisions 1128965 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1128965 | winterz | 2010-05-20 15:59:13 -0400 (Thu, 20 May 2010) | 3 lines
a better way of reading X-SUMMARY and X-LOCATION freebusy parameters.
MERGE: trunk
........
................
r1130090 | mlaurent | 2010-05-24 14:34:07 +0200 (Mon, 24 May 2010) | 2 lines
Clean up
................
r1130092 | mlaurent | 2010-05-24 14:39:43 +0200 (Mon, 24 May 2010) | 2 lines
not necessary with akonadi
................
r1130094 | mlaurent | 2010-05-24 14:48:24 +0200 (Mon, 24 May 2010) | 3 lines
Const'ify
Return error when we can't delete messages
................
r1130125 | skelly | 2010-05-24 16:36:16 +0200 (Mon, 24 May 2010) | 1 line
Make the sort order in the tree the same as the order in the rendered content.
................
r1130127 | tokoe | 2010-05-24 16:38:29 +0200 (Mon, 24 May 2010) | 4 lines
Print organization and title/role in detailed style
BUG: 235177
................
r1130136 | skelly | 2010-05-24 17:03:53 +0200 (Mon, 24 May 2010) | 1 line
Save and restore kjots viewstate across restarts.
................
r1130145 | skelly | 2010-05-24 17:32:11 +0200 (Mon, 24 May 2010) | 3 lines
Set dynamicSortFilter to true.
I don't know why this is false by default.
................
r1130146 | skelly | 2010-05-24 17:32:13 +0200 (Mon, 24 May 2010) | 1 line
Set dynamicSortFilter to true.
................
r1130159 | smartins | 2010-05-24 18:27:44 +0200 (Mon, 24 May 2010) | 2 lines
fix typo reported by Frederik Schwarzer
................
r1130172 | skelly | 2010-05-24 18:54:27 +0200 (Mon, 24 May 2010) | 1 line
Use the static methods instead of the old match() method.
................
r1130173 | skelly | 2010-05-24 18:54:29 +0200 (Mon, 24 May 2010) | 1 line
Ensure that the parent collection can be found if available.
................
r1130174 | skelly | 2010-05-24 18:54:31 +0200 (Mon, 24 May 2010) | 1 line
Fix off-by-one that occurs when moving items down the list.
................
r1130231 | mlaurent | 2010-05-24 21:49:24 +0200 (Mon, 24 May 2010) | 2 lines
Fix includes
................
r1130236 | mlaurent | 2010-05-24 22:02:51 +0200 (Mon, 24 May 2010) | 2 lines
Don't show path when it's a virtual folder
................
r1130237 | mlaurent | 2010-05-24 22:11:20 +0200 (Mon, 24 May 2010) | 2 lines
Use kDebug
................
r1130261 | otrichet | 2010-05-24 23:18:48 +0200 (Mon, 24 May 2010) | 1 line
Display news article like message/rfc2822 in akonadiconsole
................
r1130270 | otrichet | 2010-05-24 23:51:13 +0200 (Mon, 24 May 2010) | 1 line
Fix header display of the "all headers" style
................
svn path=/branches/work/komo/kdepim/; revision=1130358
Montel Laurent
Tobias Koenig
Volker Krause
Tobias Koenig
José Millán Soto
David Faure
Andras Mantia