Merge local subscription support from proko2.
This allows you to use online IMAP for your mails and disconnected IMAP
for your groupware data on the same Kolab account.
svn path=/trunk/KDE/kdepim/; revision=642514
Don't list messages in the INBOX if it is the one of the groupware
main account and we are in "only groupware folders for this account"
mode. (proko issue 1207)
Merge SVN commit 531668 by tilladam from proko2:
Change the default for this back to true. (proko2 issue 1206)
Merge SVN commit 531683 by tilladam from proko2:
If we are hiding groupware folders, and the account is the groupware
base account, and it's set to only locally subscribe to groupware folders,
hide it completely from the folder tree. (proko2 issue 1207)
svn path=/branches/kdepim/enterprise/kdepim/; revision=642185
pre-condition:
two instances of the same event with two attendees in a folder which both
have access to and which they both use to store the event. This leads to
two events with the same uid, one of which has an internal uid, which is
used as the uid inside korganizer, to discern the duplicates. Let alpha
be the original event, and beta the copy, with the internal uid.
Here's what should happen:
1) user A changes beta and syncs it up
2) user B syncs, get's removal of old version of beta, which triggers
removal of the internal uid from the uid map
3) user B gets addition of the new version, with internal uid, add the
event again, with internal uid
But due to the bug this happens:
1) as before
2) user B syncs, but KMail signals deletion of event using uid, not
internal uid, thus internal uid is never removed from uid map
3) addition of new version of beta (with internal uid) triggers
conflict resolution, since internal uid is still in the map
Fix: parse kolab xml in KMail to find internal uid if present
and use it already at the stage of dcop signal emission.
(Kolab Issue 1298)
svn path=/branches/kdepim/proko2/kdepim/; revision=571107
base account, and it's set to only locally subscribe to groupware folders,
hide it completely from the folder tree. (proko2 issue 1207)
svn path=/branches/kdepim/proko2/kdepim/; revision=531683
performance bottleneck, and it's called in a tight loop for each loaded
incidence. Further step towards fixing issue 1118.
svn path=/branches/kdepim/proko2/kdepim/; revision=522435
accounts. This basically stores a blacklist of unsubscribed folders
(since we want new folders to show up, intially) per account, which is
persisted to kconfig. This list is used as a filter during folder
listing. Some heavy-ish refactoring of the subscription dialog to make
it extensible enough to allow reusing it for the user interface.
(proko2 issue 1095)
svn path=/branches/kdepim/proko2/kdepim/; revision=516320
QMAX/QMIN -> qMax/qMin
I don't know what to do about Q_LONG and Q_ULONG because of the following code in qglobal.h:
#if defined(Q_OS_WIN64)
typedef __int64 Q_LONG; /* word up to 64 bit signed */
typedef unsigned __int64 Q_ULONG; /* word up to 64 bit unsigned */
#else
typedef long Q_LONG; /* word up to 64 bit signed */
typedef unsigned long Q_ULONG; /* word up to 64 bit unsigned */
#endif
Should I simply convert to (unsigned) long?
svn path=/trunk/KDE/kdepim/; revision=468393
Stephan Kulow
Allen Winter
Volker Krause
Mathias Soeken
Matthias Kretz
David Faure
Aaron J. Seigo
Jaison Lee
Tom Albers
Till Adam
Laurent Montel
Reinhold Kainhofer
Dirk Mueller
Chusslove Illich
Andreas Gungl
Malcolm Hunter
Ingo Klcker