Merged revisions 993251,993269-993270,993305,993311,993326,993338,993446,993450,993461-993464,993472,993474,993477,993480,993495,993501,993515,993518,993520,993522,993531,993542,993545,993550,993557,993561,993573,993582,993591,993599,993629,993641,993738,993741-993742,993746,993846,993878,993906,993963-993964,993970,994012,994017,994063,994093,994129,994223,994262,994339,994382,994441,994459,994532 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r993251 | trueg | 2009-07-08 12:46:00 +0200 (Wed, 08 Jul 2009) | 3 lines
Nepomuk rcgen cleanup first step (or rather fourth or something considering tokoe's amazing work before):
- disabling templates. we do not use them anyway and they will be deprecated soon.
........
r993269 | skelly | 2009-07-08 13:14:13 +0200 (Wed, 08 Jul 2009) | 1 line
Make sure tests includes are available.
........
r993270 | skelly | 2009-07-08 13:14:17 +0200 (Wed, 08 Jul 2009) | 2 lines
Break the main window into a tabbed interface for multiple proxy model
tests.
........
r993305 | lueck | 2009-07-08 14:52:34 +0200 (Wed, 08 Jul 2009) | 1 line
typo fix
........
r993311 | winterz | 2009-07-08 15:08:11 +0200 (Wed, 08 Jul 2009) | 9 lines
Refinement of import/export of kaddressbook from/to GMX.
Patch entirely from Urs Joss. Thanks!
Joss, please close the review board request for this as closed.
Remember: we need to also put this into kcontactmanager.
http://reviewboard.kde.org/r/941
CCMAIL: tschenturs@gmx.ch
........
r993326 | djarvie | 2009-07-08 15:42:42 +0200 (Wed, 08 Jul 2009) | 1 line
Move methods out of base class
........
r993338 | vkrause | 2009-07-08 16:00:53 +0200 (Wed, 08 Jul 2009) | 4 lines
Birthday resources can have different settings, so it does not make
sense to only allow one instance. Should help with the migration problem
David is seeing.
........
r993446 | skelly | 2009-07-08 19:47:31 +0200 (Wed, 08 Jul 2009) | 6 lines
Add another configuration use for the selection proxy model.
This is getting cumbersome, so I will soon change the API and refactor
the internals.
There are also some remaining nagging bugs.
........
r993450 | skelly | 2009-07-08 19:50:58 +0200 (Wed, 08 Jul 2009) | 1 line
Enable akonadi_next to be built standalone.
........
r993461 | skelly | 2009-07-08 20:12:46 +0200 (Wed, 08 Jul 2009) | 1 line
Start some support for AmazingCompletion(tm)
........
r993462 | skelly | 2009-07-08 20:12:50 +0200 (Wed, 08 Jul 2009) | 4 lines
Create a sane implementation od AbstractProxyModelMatch.
This should be in QAbstractProxyModel. I'll patch it there later and
send a merge request upstream.
........
r993463 | skelly | 2009-07-08 20:12:53 +0200 (Wed, 08 Jul 2009) | 2 lines
Implement match for the ContactsModel. Will allow matching Amazingly
eventually.
........
r993464 | skelly | 2009-07-08 20:12:57 +0200 (Wed, 08 Jul 2009) | 1 line
Reimplement match.
........
r993472 | skelly | 2009-07-08 20:25:04 +0200 (Wed, 08 Jul 2009) | 1 line
Better match implementation.
........
r993474 | tmcguire | 2009-07-08 20:33:31 +0200 (Wed, 08 Jul 2009) | 4 lines
Prevent an infinite recursion when entering a new folder with at least one message.
Curiously, this is very similar to kolab/issue3727
........
r993477 | skelly | 2009-07-08 20:39:54 +0200 (Wed, 08 Jul 2009) | 1 line
Really fix matching this time.
........
r993480 | mleupold | 2009-07-08 20:51:54 +0200 (Wed, 08 Jul 2009) | 1 line
Fix/hide various krazy issues including most qclasses, QLatin1String and kdebug.
........
r993495 | bbroeksema | 2009-07-08 21:39:29 +0200 (Wed, 08 Jul 2009) | 2 lines
Krazy fixes: Use const references instead of const values in Q_FOREACH.
........
r993501 | mlaurent | 2009-07-08 21:44:23 +0200 (Wed, 08 Jul 2009) | 2 lines
compile++
........
r993515 | tstaerk | 2009-07-08 22:18:36 +0200 (Wed, 08 Jul 2009) | 1 line
karm->ktimetracker && dcop->dbus
........
r993518 | tstaerk | 2009-07-08 22:30:55 +0200 (Wed, 08 Jul 2009) | 1 line
karm->ktimetracker && dcop->dbus
........
r993520 | cgiboudeaux | 2009-07-08 22:41:32 +0200 (Wed, 08 Jul 2009) | 1 line
SVN_SILENT Cleanup
........
r993522 | cgiboudeaux | 2009-07-08 22:42:49 +0200 (Wed, 08 Jul 2009) | 1 line
Cleanup
........
r993531 | tstaerk | 2009-07-08 22:53:34 +0200 (Wed, 08 Jul 2009) | 1 line
What you never wanted to know about ktimetracker, but were forced to learn anyway--
........
r993542 | bbroeksema | 2009-07-08 23:06:33 +0200 (Wed, 08 Jul 2009) | 2 lines
Krazy fixes: null string assign -> clear()
........
r993545 | bbroeksema | 2009-07-08 23:19:38 +0200 (Wed, 08 Jul 2009) | 2 lines
SVN_SILENT: fix two small spelling errors in comments.
........
r993550 | cgiboudeaux | 2009-07-08 23:29:37 +0200 (Wed, 08 Jul 2009) | 1 line
Partially revert of r967753. Only kresources and plugins must be built after the optional applications.
........
r993557 | bbroeksema | 2009-07-08 23:36:51 +0200 (Wed, 08 Jul 2009) | 2 lines
Fix krazy issues: QLatin1String
........
r993561 | cgiboudeaux | 2009-07-08 23:39:10 +0200 (Wed, 08 Jul 2009) | 1 line
SVN_SILENT Cleanup
........
r993573 | bbroeksema | 2009-07-09 00:02:53 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fixes: proper include directives.
........
r993582 | bbroeksema | 2009-07-09 00:25:27 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fixes: proper include directives.
........
r993591 | bbroeksema | 2009-07-09 01:02:21 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fixes: proper include directives.
........
r993599 | winterz | 2009-07-09 02:32:58 +0200 (Thu, 09 Jul 2009) | 3 lines
compile++
add cstdlib header for exit()
........
r993629 | bbroeksema | 2009-07-09 09:04:53 +0200 (Thu, 09 Jul 2009) | 2 lines
Revert part of r993495 because Protocol is an enum. Let krazy ignore these lines.
........
r993641 | bbroeksema | 2009-07-09 10:42:09 +0200 (Thu, 09 Jul 2009) | 4 lines
Reduce reloads of resources based on the SingleFileResource by using hashes of
the file. This commit prevents reloads of resources based on singlefileresource
when the resource is writing changes to the file itself.
........
r993738 | pokrzywka | 2009-07-09 14:26:52 +0200 (Thu, 09 Jul 2009) | 1 line
nicer fix for the --templates bug in nepomuk_rcgen: only add the option if there are templates specified. Not sure if that will ever be needed again though, but it doesn't hurt for now.
........
r993741 | djarvie | 2009-07-09 14:35:19 +0200 (Thu, 09 Jul 2009) | 1 line
Fix compile warning
........
r993742 | winterz | 2009-07-09 14:46:42 +0200 (Thu, 09 Jul 2009) | 6 lines
Go crazy with node validity checks to try and fix all the crash reports that I can't reproduce.
Might fix
CCBUG: 198961
MERGE: e4,4.3
........
r993746 | pokrzywka | 2009-07-09 14:51:40 +0200 (Thu, 09 Jul 2009) | 3 lines
fixed the build problems with the nepomuk agents on windows. The generated files now handle static linking.
CCMAIL:till@kdab.net
........
r993846 | winterz | 2009-07-09 17:11:23 +0200 (Thu, 09 Jul 2009) | 7 lines
Urs' cleanups
Add Urs to copyright.
I'll copy this into kcontactmanager.
MERGE: e4
........
r993878 | scripty | 2009-07-09 17:42:19 +0200 (Thu, 09 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r993906 | jtamate | 2009-07-09 18:58:08 +0200 (Thu, 09 Jul 2009) | 3 lines
BUG: 192897
Added "at the bottom of the Security tab in this dialog" to the message.
........
r993963 | bbroeksema | 2009-07-09 22:20:13 +0200 (Thu, 09 Jul 2009) | 2 lines
Fix krazy issues: Proper include directives.
........
r993964 | bbroeksema | 2009-07-09 22:24:44 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fix: single-char QString operations
........
r993970 | bbroeksema | 2009-07-09 22:29:56 +0200 (Thu, 09 Jul 2009) | 2 lines
Krazy fix: C++ ctors that should be declared 'explicit'
........
r994012 | bbroeksema | 2009-07-10 00:01:00 +0200 (Fri, 10 Jul 2009) | 2 lines
Krazy fixes: validity of i18n calls.
........
r994017 | bbroeksema | 2009-07-10 00:07:32 +0200 (Fri, 10 Jul 2009) | 3 lines
Krazy fix: [foreach[ This is not a call to keys of a map or set, but to a
std::vector. Ignore this one.
........
r994063 | winterz | 2009-07-10 04:16:56 +0200 (Fri, 10 Jul 2009) | 4 lines
fix spacing between the pixmap and the urllabel
BUG: 199598
MERGE: e4,4.3
........
r994093 | mlaurent | 2009-07-10 09:10:16 +0200 (Fri, 10 Jul 2009) | 2 lines
Apply patch
........
r994129 | trueg | 2009-07-10 11:15:40 +0200 (Fri, 10 Jul 2009) | 4 lines
Moved NepomukAddOntologyClasses to kdelibs. No need for a local copy anymore.
Also by default rcgen will not export classes anymore. Thus, there is no need
for the define anymore.
........
r994223 | vkrause | 2009-07-10 13:59:23 +0200 (Fri, 10 Jul 2009) | 3 lines
No need to try to migrate the not yet/no longer supported file formats
of the KABC file resource in every run.
........
r994262 | djarvie | 2009-07-10 15:36:32 +0200 (Fri, 10 Jul 2009) | 4 lines
Refactor to remove dependencies in KAEvent, KARecurrence and AlarmText on KAlarm
preferences, in preparation for Akonadi migration.
All KAEvent data independent of preferences is not in KAEventData.
........
r994339 | ervin | 2009-07-10 16:35:40 +0200 (Fri, 10 Jul 2009) | 2 lines
Let's allow people to type in the KDateEdit. Okay? :-)
........
r994382 | djarvie | 2009-07-10 16:51:41 +0200 (Fri, 10 Jul 2009) | 1 line
Fix alarms not being triggered if reminders occur AFTER the main alarm
........
r994441 | scripty | 2009-07-10 17:19:10 +0200 (Fri, 10 Jul 2009) | 1 line
SVN_SILENT made messages (.desktop file)
........
r994459 | cgiboudeaux | 2009-07-10 17:37:43 +0200 (Fri, 10 Jul 2009) | 1 line
SVN_SILENT Remove the extra comma
........
r994532 | vkrause | 2009-07-10 19:36:12 +0200 (Fri, 10 Jul 2009) | 4 lines
Use the recently introduced server-side collection content mimetype
filtering. This fixes Kolab collections not showing up in eg.
KContactManager.
........
svn path=/branches/work/akonadi-ports/kdepim/; revision=994567
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
........
r971085 | tmcguire | 2009-05-21 18:38:12 +0200 (Thu, 21 May 2009) | 7 lines
Don't encode the X-UID header in the charset of the message, otherwise UTF-16 messages
will cause duplicating messages on disconnected IMAP.
This is a hack, I have the feeling that the core problem is something else.
I guess it is not allowed to encode the header fields in anything non-ascii in
the first place, but decodeRFC2047String() does exactly that...
........
svn path=/trunk/KDE/kdepim/; revision=971091
will cause duplicating messages on disconnected IMAP.
This is a hack, I have the feeling that the core problem is something else.
I guess it is not allowed to encode the header fields in anything non-ascii in
the first place, but decodeRFC2047String() does exactly that...
svn path=/branches/kdepim/enterprise4/kdepim/; revision=971085
Merged revisions 961758 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r961758 | winterz | 2009-04-30 18:18:29 +0200 (Thu, 30 Apr 2009) | 14 lines
Merged revisions 961755 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r961755 | winterz | 2009-04-30 12:10:02 -0400 (Thu, 30 Apr 2009) | 8 lines
fix bug where forward to filters aren't sent according to the default sending type
(which is typically to send now).
fixes kolab/issue3228 (again)
probably needs to be ported to e4/trunk/4.2
........
................
svn path=/branches/KDE/4.2/kdepim/; revision=964284
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r961758 | winterz | 2009-04-30 18:18:29 +0200 (Thu, 30 Apr 2009) | 14 lines
Merged revisions 961755 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r961755 | winterz | 2009-04-30 12:10:02 -0400 (Thu, 30 Apr 2009) | 8 lines
fix bug where forward to filters aren't sent according to the default sending type
(which is typically to send now).
fixes kolab/issue3228 (again)
probably needs to be ported to e4/trunk/4.2
........
................
svn path=/trunk/KDE/kdepim/; revision=964241
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r961755 | winterz | 2009-04-30 12:10:02 -0400 (Thu, 30 Apr 2009) | 8 lines
fix bug where forward to filters aren't sent according to the default sending type
(which is typically to send now).
fixes kolab/issue3228 (again)
probably needs to be ported to e4/trunk/4.2
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=961758
(which is typically to send now).
fixes kolab/issue3228 (again)
probably needs to be ported to e4/trunk/4.2
svn path=/branches/kdepim/enterprise/kdepim/; revision=961755
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
................
r957591 | tmcguire | 2009-04-22 17:06:42 +0200 (Wed, 22 Apr 2009) | 11 lines
Merged revisions 944433 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r944433 | tmcguire | 2009-03-25 16:02:25 +0100 (Wed, 25 Mar 2009) | 4 lines
Add the ability to use custom To and CC addresses in the forward templates.
Part of kolab/issue3263
........
................
svn path=/trunk/KDE/kdepim/; revision=961582
Fix online IMAP filters not working in various situations.
Patch by Matthias Gehre <M.Gehre@gmx.de>, thanks very much!
CCBUG: 171061
CCBUG: 174430
CCBUG: 182208
CCBUG: 186264
svn path=/branches/KDE/4.2/kdepim/; revision=960606
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r944433 | tmcguire | 2009-03-25 16:02:25 +0100 (Wed, 25 Mar 2009) | 4 lines
Add the ability to use custom To and CC addresses in the forward templates.
Part of kolab/issue3263
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=957591
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r944195 | tmcguire | 2009-03-25 10:26:38 +0100 (Wed, 25 Mar 2009) | 4 lines
Add support for forwarding with a custom template when filtering.
Part of kolab/issue3263
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=957554
Tested and seems to still work.
--
Merged revisions 940772,940775,940777,940816 via svnmerge from
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.2/kdepim
........
r940772 | tmcguire | 2009-03-18 10:32:23 +0100 (Wed, 18 Mar 2009) | 20 lines
Backport r940441 by tmcguire from trunk to the 4.2 branch:
Don't produce garbage when forwarding a mail with a filter.
For this, I had to remove the code duplication in KMFilterActionForward::process()
and use KMMessage::createForward() instead.
This uncovered a bug in createForward (content type boundary was not saved) and a
small bug in the template parser.
Also, I added a KMMessage::dump() function to help with debugging mimelib
related troubles.
Not perfect yet, the way the template parser copies the message needs to be
improved, right now, when forwarding a signed message, the signed text gets
replaced with the template text, resulting in an invalid signature ...
CCBUG: 174942
........
r940775 | tmcguire | 2009-03-18 10:34:02 +0100 (Wed, 18 Mar 2009) | 11 lines
Backport r940516 by tmcguire from trunk to the 4.2 branch:
When replacing the text of a message after processing the template, don't try
to just replace the first text/plain part, this will cause trouble with signatures
and possibly many other situations.
Instead, delete the content of the old message, and set the processed
template text as the first body part.
If the old message had attachments, re-add them to the new message.
........
r940777 | tmcguire | 2009-03-18 10:36:48 +0100 (Wed, 18 Mar 2009) | 9 lines
Backport r940547 by tmcguire from trunk to the 4.2 branch:
Make valgrind happy.
This didn't find the cause of the problem I was searching for, though
(inline forwarding runs out of memory because allocating insanley huge
amounts of memory)
........
r940816 | tmcguire | 2009-03-18 11:52:19 +0100 (Wed, 18 Mar 2009) | 8 lines
Backport r940565 by tmcguire from trunk to the 4.2 branch:
Don't run out of memory when forwarding a mail with more than one
attachment.
The mimelib behavior here is very irritating...
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=940873
Don't produce garbage when forwarding a mail with a filter.
For this, I had to remove the code duplication in KMFilterActionForward::process()
and use KMMessage::createForward() instead.
This uncovered a bug in createForward (content type boundary was not saved) and a
small bug in the template parser.
Also, I added a KMMessage::dump() function to help with debugging mimelib
related troubles.
Not perfect yet, the way the template parser copies the message needs to be
improved, right now, when forwarding a signed message, the signed text gets
replaced with the template text, resulting in an invalid signature ...
CCBUG: 174942
svn path=/branches/KDE/4.2/kdepim/; revision=940772
For this, I had to remove the code duplication in KMFilterActionForward::process()
and use KMMessage::createForward() instead.
This uncovered a bug in createForward (content type boundary was not saved) and a
small bug in the template parser.
Also, I added a KMMessage::dump() function to help with debugging mimelib
related troubles.
Not perfect yet, the way the template parser copies the message needs to be
improved, right now, when forwarding a signed message, the signed text gets
replaced with the template text, resulting in an invalid signature ...
BUG: 174942
svn path=/trunk/KDE/kdepim/; revision=940441
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.1/kdepim
........
r884326 | tmcguire | 2008-11-14 17:59:11 +0100 (Fri, 14 Nov 2008) | 9 lines
Backport r884142 by tmcguire from trunk to the 4.1 branch:
When piping a message to an external command, be sure to check
the return value of kByteArrayToFile().
This fixes mail loss when the tmp partition is full and spam filtering
is used.
........
svn path=/branches/kdepim/enterprise4/kdepim/; revision=884328
When piping a message to an external command, be sure to check
the return value of kByteArrayToFile().
This fixes mail loss when the tmp partition is full and spam filtering
is used.
svn path=/branches/KDE/4.1/kdepim/; revision=884326
the return value of kByteArrayToFile().
This fixes mail loss when the tmp partition is full and spam filtering
is used.
svn path=/trunk/KDE/kdepim/; revision=884142
This brings a reworked folder tree and and a new message list, which is much more powerful than the old one.
New features include grouping, multiline items and the ability to customize just about everything of the look of the message list.
Also, we have a tabbed interface for opening more than one folder at once now.
An important aspect of the new message list is that drawing speed is now fast again (there was a regression in Q3ListView that
made huge folders a real pain to navigate, reading commit folders was not a nice thing to do).
There are probably more things which I forgot to list here.
Also, this is big step forward in getting rid of Qt3Support in KMail, now just some tiny bits are left.
Many thanks to SoC student Szymon Stefanek for his awesome work on his project! I can't stress enough how great this
achivment is. He even added very good API documentation to his classes :)
This requires the lastest version of qt-copy, otherwise you'll get mysterious crashes in Qt painting code from time to time.
We hope that this patch will be added to the next Qt 4.4.x version.
And finally, this merge also brings many regressions, which is not unnatural for such a big change.
In the remaining time before the KDE 4.2 release, we'll have to work on those to get it polished and regression-free.
Help here is always needed, and is a good opportunity to start working on KMail, since many regressions are low hanging fruit.
It also means the message list and the folder tree need a bit of testing.
If you find bugs, report them under the "new message list" and "new folder tree" component of the bug tracker, thanks.
I also plan to setup a wiki page with known regressions.
CCMAIL: kde-pim@kde.org
GUI:
CCBUG: 117808
BUG: 163469
FEATURE: 18170
FEATURE: 32400
FEATURE: 42107
FEATURE: 45526
FEATURE: 81272
FEATURE: 90142
FEATURE: 107450
(and probably many others)
svn path=/trunk/KDE/kdepim/; revision=881321
Laurent Montel
Thomas McGuire
Martin Koller
Bruno Bigras
Volker Krause
Michael Leupold
Allen Winter
Romain Pokrzywka
Jonathan Armond
Andrew Coles
Torgny Nyblom