r1002959 | pokrzywka | 2009-07-27 14:17:58 +0200 (Mon, 27 Jul 2009) | 1 line

fix, take 2 : setRDict() already deleted the rdict so avoid the double deletion

r1003094 | skelly | 2009-07-27 18:44:28 +0200 (Mon, 27 Jul 2009) | 3 lines

Pass modeltest in a hacky way for now.

EntityTreeModel doesn't handle columns > 1.

r1003149 | winterz | 2009-07-27 21:04:42 +0200 (Mon, 27 Jul 2009) | 6 lines

When showing the to-do editor from KMail, customize it a little bit and don't
enable the [Apply] button.  This fixes a kolab/issue3759.

MERGE: e35,e4
DO_NOT_BACKPORT: feature-ish

r1003181 | tmcguire | 2009-07-27 22:14:50 +0200 (Mon, 27 Jul 2009) | 8 lines

- Remove Profile support. It was broken, and nobody noticed, and also had a lot
  of other problems.
- Convert some options to KConfigXT, and remove the custom config stuff.
- Add a checkbox "Show Message Structure" to the view menu and the RMB menu in
  the reader.
  Hide the structure viewer by default, it clutters the UI too much and is only for
  experts anyway.

r1003190 | winterz | 2009-07-27 22:27:09 +0200 (Mon, 27 Jul 2009) | 2 lines

revertlast

r1003201 | tmcguire | 2009-07-27 22:48:36 +0200 (Mon, 27 Jul 2009) | 8 lines

Less clutter:
- Get rid of the message structure viewer location option.
  It is now always "below".
- Get rid of the message structure viewer show/hide option,
  we have a checkbox in the View and RMB menu for that now.
  Also, remove the "smart" option altogether.

r1003213 | stefanek | 2009-07-27 23:05:58 +0200 (Mon, 27 Jul 2009) | 1 line

Fix a problem with the sort indicator not properly restored after a folder change.

r1003214 | tmcguire | 2009-07-27 23:11:17 +0200 (Mon, 27 Jul 2009) | 1 line

Add more linebreak nodes.

r1003305 | winterz | 2009-07-28 02:43:28 +0200 (Tue, 28 Jul 2009) | 7 lines

Cleanup some i18n strings that use "Abort" where "Cancel" would be better,
according to the usability people.

Inspired by Mackenzie's patch on RB, http://reviewboard.kde.org/r/1018
MERGE: none
DO_NOT_BACKPORT: new i18n strings

r1003314 | winterz | 2009-07-28 03:04:53 +0200 (Tue, 28 Jul 2009) | 5 lines

CamelCase headers
remove unused headers
coding style
full KUIT

r1003318 | winterz | 2009-07-28 03:14:30 +0200 (Tue, 28 Jul 2009) | 2 lines

crashy--

r1003523 | scripty | 2009-07-28 11:37:49 +0200 (Tue, 28 Jul 2009) | 1 line

SVN_SILENT made messages (.desktop file)

r1003568 | bbigras | 2009-07-28 13:47:23 +0200 (Tue, 28 Jul 2009) | 3 lines

New "add to address book" filter type. Based on a commit from
Christian Schaarschmidt on the 3.5.5+ branch.
BUG: 47333

r1003593 | stikonas | 2009-07-28 14:38:57 +0200 (Tue, 28 Jul 2009) | 1 line

Use KIntSpinBox instead of QSpinBox for better integration with KDE. As a bonus this allows to use plural-aware suffix in spinboxes since KDE 4.3.

r1003618 | cgiboudeaux | 2009-07-28 15:30:31 +0200 (Tue, 28 Jul 2009) | 1 line

Fix build.

r1003658 | skelly | 2009-07-28 16:44:57 +0200 (Tue, 28 Jul 2009) | 1 line

Populate the AkonadiBrowserModel lazily. Unfortunately, not as lazily as I'd like, but it's a good start.

r1003659 | skelly | 2009-07-28 16:45:52 +0200 (Tue, 28 Jul 2009) | 3 lines

Minor cleanup

SVN_SILENT

r1003660 | skelly | 2009-07-28 16:46:35 +0200 (Tue, 28 Jul 2009) | 1 line

Try to fetch more items on click.

r1004135 | ervin | 2009-07-29 14:15:10 +0200 (Wed, 29 Jul 2009) | 2 lines

Allow to create extra sessions from the same account, and to close them.

r1004137 | ervin | 2009-07-29 14:18:44 +0200 (Wed, 29 Jul 2009) | 8 lines

Add an helper class to manage the IDLE command from within the resource.
That's where the logic to trigger a resync of a collection is.

Use this new helper from the resource, which means creating an extra
session for it so that it doesn't block normal operations only triggers
resync. Also remove the polling on INBOX when IDLE is detected, in this
case it's not needed as we'll just react to server notifications.

r1004169 | tnyblom | 2009-07-29 15:40:59 +0200 (Wed, 29 Jul 2009) | 3 lines

Extract the UI code for Configure dialogs Accont page, recieving tab into a .ui file.

r1004192 | cgiboudeaux | 2009-07-29 16:50:15 +0200 (Wed, 29 Jul 2009) | 3 lines

Don't forget the konsolekalendar and kabcclient doc.
MERGE: 4.3

r1004194 | ervin | 2009-07-29 16:51:15 +0200 (Wed, 29 Jul 2009) | 2 lines

Force a full reconnect when the server dropped our IDLE connection.

r1004248 | amantia | 2009-07-29 19:56:11 +0200 (Wed, 29 Jul 2009) | 1 line

Use the right mimetype.

r1004249 | amantia | 2009-07-29 19:57:01 +0200 (Wed, 29 Jul 2009) | 1 line

SVN_SILENT Fix the example.

r1004251 | amantia | 2009-07-29 20:03:38 +0200 (Wed, 29 Jul 2009) | 1 line

SVN_SILENT oops, revert unintended commit

r1004265 | djarvie | 2009-07-29 20:22:32 +0200 (Wed, 29 Jul 2009) | 1 line

Fix uninitialised variable

r1004266 | tmcguire | 2009-07-29 20:23:46 +0200 (Wed, 29 Jul 2009) | 4 lines

Also support cc, body and subject when passing mailto urls on the command line.

CCMAIL: l.lunak@kde.org

r1004275 | tmcguire | 2009-07-29 20:57:06 +0200 (Wed, 29 Jul 2009) | 10 lines

Get rid of the toolbuttons for aggregation, sort order and theme.
Instead, provide those in the
  - view menu
  - header context menu

This removes UI clutter from the main window. Also, the toolbuttons
were confusing for people, they didn't discover their purpose.

Patch by James Bendig <james at imptalk dot com>, thank you!

r1004283 | winterz | 2009-07-29 21:19:47 +0200 (Wed, 29 Jul 2009) | 9 lines

Recorded merge of revisions 1004189 via svnmerge from 
https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004189 | tilladam | 2009-07-29 10:31:28 -0400 (Wed, 29 Jul 2009) | 1 line

  Fix the time shown in agenditem tooltips by resolving the timezone properly.
........

r1004297 | krake | 2009-07-29 21:49:51 +0200 (Wed, 29 Jul 2009) | 7 lines

Should probably only access the job's results if it succeeded.
Gen an assert in QList::first() without the check.

After adding the kError I got
CollectionFetch for mail box  "INBOX" failed. error= 103 , errorString= "Unknown error. (2 collections found)"

r1004486 | tmcguire | 2009-07-30 12:22:50 +0200 (Thu, 30 Jul 2009) | 6 lines

Make the status filter a combo box again, now that we have more space.

Based on a batch from Vincent Dupont <vincent.touffi at gmail dot com>, thanks!

http://reviewboard.kde.org/r/820/

r1004488 | tmcguire | 2009-07-30 12:35:44 +0200 (Thu, 30 Jul 2009) | 2 lines

Make it possible again to use quick search while the status filter is active

r1004490 | tmcguire | 2009-07-30 12:37:58 +0200 (Thu, 30 Jul 2009) | 2 lines

Reset the combobox when clearing the quick search

r1004496 | tmcguire | 2009-07-30 12:50:24 +0200 (Thu, 30 Jul 2009) | 1 line

This title is no longer true, so remove it.

r1004508 | mlaurent | 2009-07-30 13:29:14 +0200 (Thu, 30 Jul 2009) | 2 lines

Fix ui files

r1004512 | mlaurent | 2009-07-30 13:48:59 +0200 (Thu, 30 Jul 2009) | 2 lines

Fix forward declaration

r1004513 | mlaurent | 2009-07-30 13:50:48 +0200 (Thu, 30 Jul 2009) | 2 lines

Fix forward declaration

r1004515 | mlaurent | 2009-07-30 13:53:14 +0200 (Thu, 30 Jul 2009) | 2 lines

Fix forward declaration

r1004517 | mlaurent | 2009-07-30 13:54:58 +0200 (Thu, 30 Jul 2009) | 2 lines

Fix forward declaration

r1004520 | mlaurent | 2009-07-30 13:59:10 +0200 (Thu, 30 Jul 2009) | 2 lines

Fix forward declaration

r1004525 | tmcguire | 2009-07-30 14:29:01 +0200 (Thu, 30 Jul 2009) | 2 lines

Use better icons for "More" and "Fewer", as suggested by Nuno.

r1004532 | mkoller | 2009-07-30 14:44:34 +0200 (Thu, 30 Jul 2009) | 3 lines

BUG: 118289
make sure the unset time stays invalid

r1004548 | tmcguire | 2009-07-30 15:09:52 +0200 (Thu, 30 Jul 2009) | 4 lines

Use the new cool icons Nuno just committed to kdesupport/oxygen-icons.

BUG: 201783

r1004549 | ervin | 2009-07-30 15:16:57 +0200 (Thu, 30 Jul 2009) | 5 lines

Don't clear the items of the collection when we've to refetch all the
headers from the server. Just report them using the non incremental
methods and ItemSync will do its magic to reconcile the changes based on
the remote ids.

r1004619 | tmcguire | 2009-07-30 17:57:40 +0200 (Thu, 30 Jul 2009) | 1 line

SVN_SILENT warning--

r1004664 | tmcguire | 2009-07-30 19:41:27 +0200 (Thu, 30 Jul 2009) | 669 lines

Block blocks, release stuff, cyclic merges
SVN_SILENT
SVN_MERGE
--
Blocked revisions 1000923,1000925,1000928-1000929,1000933,1000936,1000938,1000950,1000955-1000957,1000962,1000968,1000970,1000974-1000977,1000979-1000982,1000986,1000988,1000990,1000992,1001140,1001143,1001151,1001156,1001363,1001827,1001836,1002666,1002946,1002964,1002979,1002981,1002983,1002985,1002993,1003223 via svnmerge

................
  r1000923 | tmcguire | 2009-07-22 12:43:07 +0200 (Wed, 22 Jul 2009) | 103 lines

  Block cyclic merges, scripty, akonadi, ...
  SVN_SILENT
  SVN_MERGE
  Blocked revisions 997633,997635,997637,998214,998245,998670,998815,998822,998828,998944,998988-998989,1000356,1000436,1000520,1000589 via svnmerge

  ........
    r997633 | sengels | 2009-07-16 10:28:52 +0200 (Thu, 16 Jul 2009) | 1 line

    fix windows linker error
  ........
    r997635 | sengels | 2009-07-16 10:33:10 +0200 (Thu, 16 Jul 2009) | 1 line

    include the correct export header too
  ........
    r997637 | krake | 2009-07-16 10:34:36 +0200 (Thu, 16 Jul 2009) | 8 lines

    Backport of r997634

    Need to handle clear() in the type specific subclass because distribution list destructors also call public API.
    During clear those need to be handled as internal changes and must not be forwarded to the base class' implementation.

    CCBUG: 200206
  ........
    r998214 | scripty | 2009-07-17 10:20:02 +0200 (Fri, 17 Jul 2009) | 1 line

    SVN_SILENT made messages (.desktop file)
  ........
    r998245 | tmcguire | 2009-07-17 11:26:20 +0200 (Fri, 17 Jul 2009) | 11 lines

    Romain, Patrick: I'm confused if this commit is now actually right or wrong.
    Ralf added it in r986963 (backported by Patrick in 989321), Romain reverted in r997095.

    CCMAIL: romain@kdab.net
    CCMAIL: ps_ml@gmx.de

    Backport r997095 by pokrzywka from trunk to the 4.3 branch:

    fixed the last broken bit on Windows.
    should be merged to 4.3 and e4 branches.
  ........
    r998670 | krake | 2009-07-18 12:37:58 +0200 (Sat, 18 Jul 2009) | 8 lines

    Backport of Revision 998669

    Do not emit resourceChanged() signal in doClose().                                                                   
    None of the other resources does it and it seems that it can trigger unwanted reloads (see bug 196215).              

    CCBUG: 196215
  ........
    r998815 | krake | 2009-07-18 18:14:51 +0200 (Sat, 18 Jul 2009) | 8 lines

    Backport of revision 998811

    Do not delete the incidence pointer, it is stored in an internal list of CalendarLocal which is set to AutoDelete and will delete the pointers on Calendar::close()

    CCBUG: 198714
    CCBUG: 198634
  ........
    r998822 | krake | 2009-07-18 18:18:10 +0200 (Sat, 18 Jul 2009) | 5 lines

    Backport of revision 998820

    CalendarLocal::close() deletes incidences removed by Calendar:deleteIncidence() (auto delete list)
  ........
    r998828 | krake | 2009-07-18 18:22:23 +0200 (Sat, 18 Jul 2009) | 5 lines

    Backport of revision 998826

    While ResourceCalendar::deleteIncidence() does not delete the incidence at this point, all resource seem to store the pointer in some "delete later" fashion, e.g. using CalendarLocal which internally has an auto delete  list of deleted incidences (cleared on Calendar::close())
  ........
    r998944 | osterfeld | 2009-07-18 20:08:15 +0200 (Sat, 18 Jul 2009) | 2 lines

    bump version for 4.3.0
  ........
    r998988 | winterz | 2009-07-18 23:26:44 +0200 (Sat, 18 Jul 2009) | 2 lines

    update the version for the upcoming 4.3.0 release
  ........
    r998989 | winterz | 2009-07-18 23:27:35 +0200 (Sat, 18 Jul 2009) | 3 lines

    increase the version here too.
    we need to eliminate this file
  ........
    r1000356 | scripty | 2009-07-21 10:09:55 +0200 (Tue, 21 Jul 2009) | 1 line

    SVN_SILENT made messages (.desktop file)
  ........
    r1000436 | krake | 2009-07-21 12:17:12 +0200 (Tue, 21 Jul 2009) | 2 lines

    Final release again without client bridge migration
  ........
    r1000520 | winterz | 2009-07-21 15:51:45 +0200 (Tue, 21 Jul 2009) | 5 lines

    The Release Team decided yesterday that an RC3 is in order.
    Change version string accordingly.    
    CCMAIL: kde-pim@kde.org
  ........
    r1000589 | vanrijn | 2009-07-21 17:53:19 +0200 (Tue, 21 Jul 2009) | 1 line

    bumping version for next week's 4.3.0 release
  ........
................
  r1000925 | tmcguire | 2009-07-22 12:48:18 +0200 (Wed, 22 Jul 2009) | 10 lines

  Merged revisions 997104 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997104 | osterfeld | 2009-07-15 13:12:21 +0200 (Wed, 15 Jul 2009) | 3 lines

    Don't crash when an embedded KPart triggers its own deletion
    BUG: 193146
  ........
................
  r1000928 | tmcguire | 2009-07-22 12:52:39 +0200 (Wed, 22 Jul 2009) | 13 lines

  Merged revisions 997225 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997225 | winterz | 2009-07-15 17:22:30 +0200 (Wed, 15 Jul 2009) | 6 lines

    Backport r989644 by jtamate from trunk to the 4.3 branch:

    CCBUG:  186551

    Using the same iconCache as in bug 191666
  ........
................
  r1000929 | tmcguire | 2009-07-22 12:54:51 +0200 (Wed, 22 Jul 2009) | 13 lines

  Merged revisions 997228 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997228 | winterz | 2009-07-15 17:28:28 +0200 (Wed, 15 Jul 2009) | 6 lines

    Backport r997218 by jtamate from trunk to the 4.3 branch:

    CCBUG: 131489

    The r+ is not needed to read the file. (and was never appened).
  ........
................
  r1000933 | tmcguire | 2009-07-22 13:00:06 +0200 (Wed, 22 Jul 2009) | 12 lines

  Merged revisions 997247 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997247 | winterz | 2009-07-15 18:24:21 +0200 (Wed, 15 Jul 2009) | 6 lines

    Backport r997245 by winterz from trunk to the 4.3 branch:

    fix translations of timezones, per Burkhard
    CCMAIL:  lueck@hube-lueck.de
  ........
................
  r1000936 | tmcguire | 2009-07-22 13:01:55 +0200 (Wed, 22 Jul 2009) | 13 lines

  Merged revisions 997349 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997349 | winterz | 2009-07-15 21:07:19 +0200 (Wed, 15 Jul 2009) | 8 lines

    Backport r997347 by winterz from trunk to the 4.3 branch:

    Burkhard tells me that "UTC" should be translated too.
    I'll backport this to the 4.3 branch.
    CCMAIL: kde-i18n-doc@kde.org
  ........
................
  r1000938 | tmcguire | 2009-07-22 13:04:08 +0200 (Wed, 22 Jul 2009) | 14 lines

  Merged revisions 997553 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997553 | winterz | 2009-07-16 02:02:13 +0200 (Thu, 16 Jul 2009) | 9 lines

    Backport r997552 by winterz from trunk to the 4.3 branch:

    Fix totally broken timezone selection that happened with we added translated timezone names.
    Burkhard, please test.

    CCMAIL: lueck@hube-lueck.de
  ........
................
  r1000950 | tmcguire | 2009-07-22 13:26:11 +0200 (Wed, 22 Jul 2009) | 11 lines

  I had to add some other stuf from ktimezonecombobox.cpp that was not backported here.

  Merged revisions 997727 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997727 | winterz | 2009-07-16 14:04:14 +0200 (Thu, 16 Jul 2009) | 3 lines

    A proper fix for setting and retriving timezones, since we introduced translated timezones.
  ........
................
  r1000955 | tmcguire | 2009-07-22 13:36:29 +0200 (Wed, 22 Jul 2009) | 5 lines

  Give up up the many conflicts in ktimezonecombobox and copy over the 4.3 version, as this is almost
  self-contained.

  MERGE: none
................
  r1000956 | tmcguire | 2009-07-22 13:42:09 +0200 (Wed, 22 Jul 2009) | 5 lines

  Crossport r887802 by winterz from trunk to the enterprise4 branch:

  follow changes to KTimeZoneComboBox
................
  r1000957 | tmcguire | 2009-07-22 13:44:05 +0200 (Wed, 22 Jul 2009) | 5 lines

  Crossport r887807 by winterz from trunk to the enterprise4 branch:

  follow KTimeZoneComboBox changes and some minor cleaning.
................
  r1000962 | tmcguire | 2009-07-22 13:47:04 +0200 (Wed, 22 Jul 2009) | 5 lines

  Crossport r887814 by winterz from trunk to the enterprise4 branch:

  follow KTimeZoneComboBox changes and some minor cleaning.
................
  r1000968 | tmcguire | 2009-07-22 13:56:28 +0200 (Wed, 22 Jul 2009) | 5 lines

  Crossport r887811 by winterz from trunk to the enterprise4 branch:

  follow KTimeZoneComboBox changes and some minor cleaning.
................
  r1000970 | tmcguire | 2009-07-22 13:59:12 +0200 (Wed, 22 Jul 2009) | 6 lines

  Crossport r887804 by winterz from trunk to the enterprise4 branch:

  follow change to KTimeZoneComboBox
  some general cleaning
................
  r1000974 | tmcguire | 2009-07-22 14:03:28 +0200 (Wed, 22 Jul 2009) | 11 lines

  Merged revisions 997777 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997777 | winterz | 2009-07-16 15:36:15 +0200 (Thu, 16 Jul 2009) | 6 lines

    Backport r997741 by winterz from trunk to the 4.3 branch:

    add icons for the "show" and "edit" actions.
  ........
................
  r1000975 | tmcguire | 2009-07-22 14:06:20 +0200 (Wed, 22 Jul 2009) | 1 line

  SVN_SILENT ignore more
................
  r1000976 | tmcguire | 2009-07-22 14:08:07 +0200 (Wed, 22 Jul 2009) | 16 lines

  Looks like this is already merged.
  SVN_SILENT
  SVN_MERGE
  --

  Recorded merge of revisions 997783 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997783 | winterz | 2009-07-16 15:42:55 +0200 (Thu, 16 Jul 2009) | 4 lines

    Backport r991462 by pokrzywka from trunk to the 4.3 branch:

    fixed attachment saving on windows: use QUrl::toLocalFile() (which returns "C:/foo") instead of QUrl::path() (which returns "/C:/foo")
  ........
................
  r1000977 | tmcguire | 2009-07-22 14:09:07 +0200 (Wed, 22 Jul 2009) | 13 lines

  Block more akonadi.
  SVN_SILENT
  Blocked revisions 997784 via svnmerge

  ........
    r997784 | winterz | 2009-07-16 15:46:03 +0200 (Thu, 16 Jul 2009) | 5 lines

    Backport r995571 by pokrzywka from trunk to the 4.3 branch:

    ensure the resource config dialogs are shown raised and activated on Windows.
    nb: merge to e4 branch (requires #995565)
  ........
................
  r1000979 | tmcguire | 2009-07-22 14:11:42 +0200 (Wed, 22 Jul 2009) | 18 lines

  Looks like this is already merged.
  SVN_SILENT
  SVN_MERGE
  --

  Recorded merge of revisions 997785 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997785 | winterz | 2009-07-16 15:46:46 +0200 (Thu, 16 Jul 2009) | 6 lines

    Backport r995572 by pokrzywka from trunk to the 4.3 branch:

    Use the new allowExternalProcessWindowActivation() instead of activateWindowForProcess(), as it handles the case "kmail started when kontact is already running", while activateWindowForProcess() would fail to find the process.

    nb: backport to e4 branch (requires #995565)
  ........
................
  r1000980 | tmcguire | 2009-07-22 14:13:46 +0200 (Wed, 22 Jul 2009) | 11 lines

  Merged revisions 997786 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r997786 | winterz | 2009-07-16 15:48:33 +0200 (Thu, 16 Jul 2009) | 4 lines

    Backport r997554 by pokrzywka from trunk to the 4.3 branch:

    cleanup
  ........
................
  r1000981 | tmcguire | 2009-07-22 14:15:00 +0200 (Wed, 22 Jul 2009) | 10 lines

  Merged revisions 998015 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r998015 | sitter | 2009-07-16 22:41:15 +0200 (Thu, 16 Jul 2009) | 3 lines

    backport r998013
    Set window icon for groupwarewizard to "kontact" (as per desktop file)
  ........
................
  r1000982 | tmcguire | 2009-07-22 14:16:14 +0200 (Wed, 22 Jul 2009) | 16 lines

  Merged revisions 998205 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r998205 | krake | 2009-07-17 10:06:31 +0200 (Fri, 17 Jul 2009) | 10 lines

    Backport of revision 998203

    Resource view items might be added/removed during resource configuration, so the item pointer might become invalid.
    Keep the resource pointer instead, the item itself isn't used anyway.

    With this change I can no longer reproduce bug #196038, but maybe it just made it harder to trigger.

    CCBUG: 196038
  ........
................
  r1000986 | tmcguire | 2009-07-22 14:20:58 +0200 (Wed, 22 Jul 2009) | 11 lines

  Merged revisions 998240 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r998240 | amantia | 2009-07-17 11:17:51 +0200 (Fri, 17 Jul 2009) | 4 lines

    Backport r998238: Don't show "too many recipients" warning for invitation mails. Fixes
    kolab/issue3718.
  ........
................
  r1000988 | tmcguire | 2009-07-22 14:22:04 +0200 (Wed, 22 Jul 2009) | 10 lines

  Merged revisions 998253 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r998253 | amantia | 2009-07-17 11:42:15 +0200 (Fri, 17 Jul 2009) | 3 lines

    Backport r998252. 
  ........
................
  r1000990 | tmcguire | 2009-07-22 14:27:32 +0200 (Wed, 22 Jul 2009) | 12 lines

  Merged revisions 1000006 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim

  ........
    r1000006 | osterfeld | 2009-07-20 19:48:06 +0200 (Mon, 20 Jul 2009) | 4 lines

    don't use the deletejob (which is only a fake async job for akonadi porting preparation) but delete directly. Looking up the article in the feed list does not work as the main feed list at deletejob creation time is an empty one.
    Fixes the LimitArticleNumber feature

    BUG: 189771
  ........
................
  r1000992 | tmcguire | 2009-07-22 14:29:35 +0200 (Wed, 22 Jul 2009) | 27 lines

  Again, block those Akregator commits, as all of them have conflicts.
  Frank, if you want them in e4, you have to port them yourself.
  CCMAIL: frank@kdab.com
  SVN_SILENT
  --
  Blocked revisions 998486,998489,998649,999999 via svnmerge

  ........
    r998486 | osterfeld | 2009-07-17 21:09:15 +0200 (Fri, 17 Jul 2009) | 3 lines

    actually do what the comment says: check host() for being empty, not the whole URL
    prevents non-URL clipboard content from being pasted
  ........
    r998489 | osterfeld | 2009-07-17 21:17:28 +0200 (Fri, 17 Jul 2009) | 4 lines

    don't crash in combined view if the selected feed has no items
    BUG:200354
  ........
    r998649 | osterfeld | 2009-07-18 11:29:26 +0200 (Sat, 18 Jul 2009) | 1 line

    bring back keyboard navigation for the feed list (up, down, left, right, top, bottom)
  ........
    r999999 | osterfeld | 2009-07-20 19:47:48 +0200 (Mon, 20 Jul 2009) | 1 line

    about copyright year
  ........
................
  r1001140 | tmcguire | 2009-07-22 18:16:43 +0200 (Wed, 22 Jul 2009) | 15 lines

  Un-revert the following commit, now that Laurent fixed it:
  ------------------------------------------------------------------------
  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.

  ------------------------------------------------------------------------
................
  r1001143 | tmcguire | 2009-07-22 18:19:18 +0200 (Wed, 22 Jul 2009) | 5 lines

  Crossport r998396 by mlaurent from trunk to the enterprise4 branch:

  fix i18n
................
  r1001151 | tmcguire | 2009-07-22 18:24:36 +0200 (Wed, 22 Jul 2009) | 8 lines

  Crossport r998407 by mlaurent from trunk to the enterprise4 branch:

  Try to fix error reported by Allen.
  CCMAIL: winter@kde.org
  Allen could you test it ?
................
  r1001156 | tmcguire | 2009-07-22 18:27:35 +0200 (Wed, 22 Jul 2009) | 4 lines

  Crossport r1000668 by lueck from trunk to the enterprise4 branch:

  fixed typo not found by Yuri
................
  r1001363 | winterz | 2009-07-23 02:41:57 +0200 (Thu, 23 Jul 2009) | 13 lines

  Recorded merge of revisions 1001016 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001016 | vkrause | 2009-07-22 09:11:25 -0400 (Wed, 22 Jul 2009) | 6 lines

    Avoid some confusion by disabling event specific inputs when not
    exporting any events.

    Kolab issue 3683
    MERGE: e4, trunk, 4.3
  ........
................
  r1001827 | tmcguire | 2009-07-24 12:54:28 +0200 (Fri, 24 Jul 2009) | 1 line

  Update Newslog.txt
................
  r1001836 | tmcguire | 2009-07-24 13:02:31 +0200 (Fri, 24 Jul 2009) | 1 line

  SVN_SILENT Update version numbers for today's release.
................
  r1002666 | winterz | 2009-07-26 20:25:54 +0200 (Sun, 26 Jul 2009) | 5 lines

  merge SVN commit 1002617 by pokrzywka:

  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.
................
  r1002946 | winterz | 2009-07-27 13:38:19 +0200 (Mon, 27 Jul 2009) | 12 lines

  Blocked revisions 1002943 via svnmerge

  ........
    r1002943 | winterz | 2009-07-27 07:31:15 -0400 (Mon, 27 Jul 2009) | 6 lines

    Almost complete rewrite of incidence attachment handling.
    DND emails, contacts, and whatever you wish.

    kolab/issue3722
    MERGE: none
  ........
................
  r1002964 | winterz | 2009-07-27 14:26:11 +0200 (Mon, 27 Jul 2009) | 4 lines

  merge SVN commit 1002959 by pokrzywka:

  fix, take 2 : setRDict() already deleted the rdict so avoid the double deletion
................
  r1002979 | winterz | 2009-07-27 14:58:02 +0200 (Mon, 27 Jul 2009) | 16 lines

  Blocked revisions 1001815,1001832,1002924 via svnmerge

  ........
    r1001815 | tmcguire | 2009-07-24 06:30:23 -0400 (Fri, 24 Jul 2009) | 1 line

    Update Newslog.txt
  ........
    r1001832 | tmcguire | 2009-07-24 07:01:19 -0400 (Fri, 24 Jul 2009) | 1 line

    SVN_SILENT Update version numbers for today's release.
  ........
    r1002924 | ludwigreiter | 2009-07-27 06:17:34 -0400 (Mon, 27 Jul 2009) | 2 lines

    Removed not-fixed issue.
  ........
................
  r1002981 | winterz | 2009-07-27 15:03:39 +0200 (Mon, 27 Jul 2009) | 10 lines

  Recorded merge of revisions 999887 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r999887 | winterz | 2009-07-20 10:38:53 -0400 (Mon, 20 Jul 2009) | 4 lines

    crash guard when formatting invitations
    kolab/issue3769
  ........
................
  r1002983 | winterz | 2009-07-27 15:08:08 +0200 (Mon, 27 Jul 2009) | 12 lines

  Recorded merge of revisions 1000859 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1000859 | vkrause | 2009-07-22 04:43:06 -0400 (Wed, 22 Jul 2009) | 5 lines

    Allow to edit the organizer field if it is empty.

    Kolab issue 3771
    MERGE: e4, trunk, 4.3
  ........
................
  r1002985 | winterz | 2009-07-27 15:10:09 +0200 (Mon, 27 Jul 2009) | 18 lines

  Recorded merge of revisions 1001350 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001350 | winterz | 2009-07-22 19:34:04 -0400 (Wed, 22 Jul 2009) | 14 lines

    A better fix for dealing with invalid attendee status strings in Kolab.
    If the status is not one of the 5 valid strings, then make the internal
    setting Attendee::None.

    Once the internal setting Attendee::None is written back to the server, it will
    become needs-action.

    In no case is an invalid status string written back to the server.

    hopefully fixes kolab/issue3766
  ........
................
  r1002993 | winterz | 2009-07-27 15:16:22 +0200 (Mon, 27 Jul 2009) | 72 lines

  Recorded merge of revisions 1001496 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001496 | vkrause | 2009-07-23 09:05:16 -0400 (Thu, 23 Jul 2009) | 66 lines

    Merge the following stuff from the ancient proko2 branch. Should fix
    various issues with invitations if you have access to a calendar of
    aanother person that is also invited.

    Kolab issue 3724

    ------------------------------------------------------------------------
    r519272 | tilladam | 2006-03-16 19:35:12 +0100 (Thu, 16 Mar 2006) | 2 lines

    Change the buttons to "Store" and "Throw away" as requested.

    ------------------------------------------------------------------------
    r513844 | tilladam | 2006-02-26 18:59:04 +0100 (Sun, 26 Feb 2006) | 2 lines

    Make sure the transaction is cleaned up also in the error case.

    ------------------------------------------------------------------------
    r513842 | tilladam | 2006-02-26 18:53:37 +0100 (Sun, 26 Feb 2006) | 4 lines

    In case an update or cancel message is processed for an incidence that
    cannot be found, inform the user, instead of blindly adding a new
    version of the incidence. (proko2 issue 1128)

    ------------------------------------------------------------------------
    r365868 | dfaure | 2004-11-24 18:19:08 +0100 (Wed, 24 Nov 2004) | 2 lines

    Can't update readonly events.

    ------------------------------------------------------------------------
    r365849 | dfaure | 2004-11-24 17:12:01 +0100 (Wed, 24 Nov 2004) | 4 lines

    Looking at the status is too unreliable since we have several versions of the event
    and libical gets confused - the whole point of this code is to do the equivalent
    with some more logic.

    ------------------------------------------------------------------------
    r365838 | dfaure | 2004-11-24 16:17:15 +0100 (Wed, 24 Nov 2004) | 2 lines

    Reworked logic to actually fix issue526

    ------------------------------------------------------------------------
    r365807 | dfaure | 2004-11-24 14:26:14 +0100 (Wed, 24 Nov 2004) | 2 lines

    More debug output (to get more info out of michel)

    ------------------------------------------------------------------------
    r365223 | dfaure | 2004-11-22 21:24:57 +0100 (Mon, 22 Nov 2004) | 3 lines

    Tentative fix for https://intevation.de/roundup/kolab/issue526 as discussed with Till.
    The server died so full testing isn't possible tonight though.

    ------------------------------------------------------------------------
    r365196 | tilladam | 2004-11-22 20:22:17 +0100 (Mon, 22 Nov 2004) | 4 lines

    Add an additional const QString &attendee parameter to acceptTransaction
    and acceptRequests so that we can compare which of the attendees in the
    event is the one we are supposed to act upon.

    ------------------------------------------------------------------------
    r364294 | tilladam | 2004-11-19 18:03:43 +0100 (Fri, 19 Nov 2004) | 4 lines

    Add unknown attendees which did not appear in the original event as
    voluntary/optional attendees. This happens when people reply that were
    invited as part of a server side distribution list. Patch by Bo.
  ........
................
  r1003223 | winterz | 2009-07-27 23:23:21 +0200 (Mon, 27 Jul 2009) | 12 lines

  Recorded merge of revisions 1003221 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1003221 | winterz | 2009-07-27 17:21:07 -0400 (Mon, 27 Jul 2009) | 6 lines

    port SVN commit 1003207 by winterz:

    When showing the to-do editor from KMail, customize it a little bit and don't
    enable the [Apply] button.  This fixes a kolab/issue3759.
  ........
................

r1004665 | tmcguire | 2009-07-30 19:43:18 +0200 (Thu, 30 Jul 2009) | 20 lines

SVN_MERGE
Merged revisions 1000998 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1000998 | winterz | 2009-07-22 14:49:03 +0200 (Wed, 22 Jul 2009) | 12 lines

  Merged revisions 1000859 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1000859 | vkrause | 2009-07-22 04:43:06 -0400 (Wed, 22 Jul 2009) | 5 lines

    Allow to edit the organizer field if it is empty.

    Kolab issue 3771
    MERGE: e4, trunk, 4.3
  ........
................

r1004666 | tmcguire | 2009-07-30 19:47:56 +0200 (Thu, 30 Jul 2009) | 21 lines

SVN_MERGE
Merged revisions 1001006 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001006 | winterz | 2009-07-22 15:02:04 +0200 (Wed, 22 Jul 2009) | 13 lines

  Merged revisions 1000899 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1000899 | vkrause | 2009-07-22 05:44:38 -0400 (Wed, 22 Jul 2009) | 6 lines

    Also recognize invitation attachments marked as text/x-vcalendar instead
    of text/calendar.

    Kolab issue 3744
    MERGE: e4, trunk, 4.3
  ........
................

r1004667 | tmcguire | 2009-07-30 19:50:50 +0200 (Thu, 30 Jul 2009) | 20 lines

SVN_MERGE
Merged revisions 1001019 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001019 | winterz | 2009-07-22 15:14:18 +0200 (Wed, 22 Jul 2009) | 12 lines

  Merged revisions 1000952 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1000952 | vkrause | 2009-07-22 07:33:21 -0400 (Wed, 22 Jul 2009) | 5 lines

    Also write Kolab properties of default groupware folders.

    Kolab issue 3734
    MERGE: e4, trunk, 4.3
  ........
................

r1004668 | tmcguire | 2009-07-30 19:53:12 +0200 (Thu, 30 Jul 2009) | 21 lines

Block, this only records a merge.
SVN_SILENT
SVN_MERGE
Blocked revisions 1001119 via svnmerge

................
  r1001119 | winterz | 2009-07-22 18:05:16 +0200 (Wed, 22 Jul 2009) | 12 lines

  Merged revisions 1001092 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001092 | winterz | 2009-07-22 11:50:55 -0400 (Wed, 22 Jul 2009) | 5 lines

    more crash guards
    kolab/issue3769

    MERGE: e4,trunk,4.3
  ........
................

r1004671 | tmcguire | 2009-07-30 19:58:55 +0200 (Thu, 30 Jul 2009) | 22 lines

SVN_SILENT
Merged revisions 1001185 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001185 | winterz | 2009-07-22 18:50:33 +0200 (Wed, 22 Jul 2009) | 14 lines

  Merged revisions 1001049 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001049 | vkrause | 2009-07-22 10:36:11 -0400 (Wed, 22 Jul 2009) | 7 lines

    Consider append-only IMAP folders read-only for the resource as we
    cannot put any changes into them (that requires deletion, since IMAP
    cannot change the content of an existing message).

    Kolab issue 3735
    MERGE: e4, trunk, 4.3
  ........
................

r1004674 | tmcguire | 2009-07-30 20:01:00 +0200 (Thu, 30 Jul 2009) | 18 lines

SVN_SILENT
Merged revisions 1001279 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001279 | winterz | 2009-07-22 21:46:39 +0200 (Wed, 22 Jul 2009) | 10 lines

  Merged revisions 1001264 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001264 | tmcguire | 2009-07-22 15:21:09 -0400 (Wed, 22 Jul 2009) | 2 lines

    Don't pretend to support crypto stuff in the attachment collector.
    MERGE: e4,trunk,4.3
  ........
................

r1004677 | tmcguire | 2009-07-30 20:02:54 +0200 (Thu, 30 Jul 2009) | 21 lines

SVN_MERGE
Merged revisions 1001281 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001281 | winterz | 2009-07-22 21:50:57 +0200 (Wed, 22 Jul 2009) | 13 lines

  Merged revisions 1001272 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001272 | tmcguire | 2009-07-22 15:31:05 -0400 (Wed, 22 Jul 2009) | 5 lines

    Parse the mime tree before collecting attachments.
    This fixes the problem that forwarding encryped mails did not work as expected.

    kolab/issue3725
    MERGE: e4,trunk,4.3
  ........
................

r1004678 | tmcguire | 2009-07-30 20:05:35 +0200 (Thu, 30 Jul 2009) | 28 lines

SVN_MERGE
Merged revisions 1001354 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001354 | winterz | 2009-07-23 01:47:36 +0200 (Thu, 23 Jul 2009) | 20 lines

  Merged revisions 1001350 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001350 | winterz | 2009-07-22 19:34:04 -0400 (Wed, 22 Jul 2009) | 14 lines

    A better fix for dealing with invalid attendee status strings in Kolab.
    If the status is not one of the 5 valid strings, then make the internal
    setting Attendee::None.

    Once the internal setting Attendee::None is written back to the server, it will
    become needs-action.

    In no case is an invalid status string written back to the server.

    hopefully fixes kolab/issue3766
    MERGE: e4,trunk
    DO_NOT_BACKPORT: 4.3 (new i18n string)
  ........
................

r1004679 | tmcguire | 2009-07-30 20:07:02 +0200 (Thu, 30 Jul 2009) | 15 lines

SVN_MERGE
Merged revisions 1001360 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1001360 | winterz | 2009-07-23 02:27:29 +0200 (Thu, 23 Jul 2009) | 7 lines

  port SVN commit 1001016 by vkrause:

  Avoid some confusion by disabling event specific inputs when not
  exporting any events.

  Kolab issue 3683
........

r1004680 | tmcguire | 2009-07-30 20:08:44 +0200 (Thu, 30 Jul 2009) | 19 lines

SVN_MERGE
Merged revisions 1001528 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001528 | tmcguire | 2009-07-23 17:05:09 +0200 (Thu, 23 Jul 2009) | 11 lines

  Merged revisions 1001524 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001524 | tmcguire | 2009-07-23 17:00:24 +0200 (Thu, 23 Jul 2009) | 4 lines

    By default, don't disable the check for too many recepients.

    Fixes kolab/issue3718.
  ........
................

r1004681 | tmcguire | 2009-07-30 20:10:31 +0200 (Thu, 30 Jul 2009) | 31 lines

SVN_MERGE
Merged revisions 1001563,1004554 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001563 | tmcguire | 2009-07-23 18:33:11 +0200 (Thu, 23 Jul 2009) | 10 lines

  Merged revisions 1001562 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001562 | tmcguire | 2009-07-23 18:28:14 +0200 (Thu, 23 Jul 2009) | 3 lines

    Don't show a folder content type combo box for online IMAP folders, because that is not supported.
    Fixes kolab/issue3742
  ........
................
  r1004554 | winterz | 2009-07-30 15:29:00 +0200 (Thu, 30 Jul 2009) | 11 lines

  Merged revisions 1004535 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1004535 | tmcguire | 2009-07-30 08:51:43 -0400 (Thu, 30 Jul 2009) | 4 lines

    Fix silly crash when creating a folder.

    kolab/issue3777
  ........
................

r1004684 | tmcguire | 2009-07-30 20:14:00 +0200 (Thu, 30 Jul 2009) | 80 lines

SVN_MERGE
Merged revisions 1001591 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1001591 | winterz | 2009-07-23 19:57:09 +0200 (Thu, 23 Jul 2009) | 72 lines

  Merged revisions 1001496 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1001496 | vkrause | 2009-07-23 09:05:16 -0400 (Thu, 23 Jul 2009) | 66 lines

    Merge the following stuff from the ancient proko2 branch. Should fix
    various issues with invitations if you have access to a calendar of
    aanother person that is also invited.

    Kolab issue 3724

    ------------------------------------------------------------------------
    r519272 | tilladam | 2006-03-16 19:35:12 +0100 (Thu, 16 Mar 2006) | 2 lines

    Change the buttons to "Store" and "Throw away" as requested.

    ------------------------------------------------------------------------
    r513844 | tilladam | 2006-02-26 18:59:04 +0100 (Sun, 26 Feb 2006) | 2 lines

    Make sure the transaction is cleaned up also in the error case.

    ------------------------------------------------------------------------
    r513842 | tilladam | 2006-02-26 18:53:37 +0100 (Sun, 26 Feb 2006) | 4 lines

    In case an update or cancel message is processed for an incidence that
    cannot be found, inform the user, instead of blindly adding a new
    version of the incidence. (proko2 issue 1128)

    ------------------------------------------------------------------------
    r365868 | dfaure | 2004-11-24 18:19:08 +0100 (Wed, 24 Nov 2004) | 2 lines

    Can't update readonly events.

    ------------------------------------------------------------------------
    r365849 | dfaure | 2004-11-24 17:12:01 +0100 (Wed, 24 Nov 2004) | 4 lines

    Looking at the status is too unreliable since we have several versions of the event
    and libical gets confused - the whole point of this code is to do the equivalent
    with some more logic.

    ------------------------------------------------------------------------
    r365838 | dfaure | 2004-11-24 16:17:15 +0100 (Wed, 24 Nov 2004) | 2 lines

    Reworked logic to actually fix issue526

    ------------------------------------------------------------------------
    r365807 | dfaure | 2004-11-24 14:26:14 +0100 (Wed, 24 Nov 2004) | 2 lines

    More debug output (to get more info out of michel)

    ------------------------------------------------------------------------
    r365223 | dfaure | 2004-11-22 21:24:57 +0100 (Mon, 22 Nov 2004) | 3 lines

    Tentative fix for https://intevation.de/roundup/kolab/issue526 as discussed with Till.
    The server died so full testing isn't possible tonight though.

    ------------------------------------------------------------------------
    r365196 | tilladam | 2004-11-22 20:22:17 +0100 (Mon, 22 Nov 2004) | 4 lines

    Add an additional const QString &attendee parameter to acceptTransaction
    and acceptRequests so that we can compare which of the attendees in the
    event is the one we are supposed to act upon.

    ------------------------------------------------------------------------
    r364294 | tilladam | 2004-11-19 18:03:43 +0100 (Fri, 19 Nov 2004) | 4 lines

    Add unknown attendees which did not appear in the original event as
    voluntary/optional attendees. This happens when people reply that were
    invited as part of a server side distribution list. Patch by Bo.
  ........
................

r1004686 | tmcguire | 2009-07-30 20:14:41 +0200 (Thu, 30 Jul 2009) | 3 lines

deprecated--
Please double-check

r1004696 | tmcguire | 2009-07-30 20:32:54 +0200 (Thu, 30 Jul 2009) | 18 lines

Please also double-check this, I got some compilation errors and conflicts.
Basically I changed KPimPrefs::timeSpecs() to KSystemTimeZones::local() in some places.

SVN_MERGE
Merged revisions 1001936 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1001936 | winterz | 2009-07-24 16:42:17 +0200 (Fri, 24 Jul 2009) | 8 lines

  as discussed and agreed to on kde-pim ml, we eliminate the pim apps being able to operate
  in their own timezone setting as configured in KOrganizer.  From now on, we simply
  use the system timezone.

  MERGE: trunk
  DO_NOT_BACKPORT: 4.3
........

r1004697 | tmcguire | 2009-07-30 20:36:34 +0200 (Thu, 30 Jul 2009) | 10 lines

SVN_MERGE
Merged revisions 1001944 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1001944 | winterz | 2009-07-24 17:16:08 +0200 (Fri, 24 Jul 2009) | 2 lines

  remove the timezone test.  we no longer will be setting our own timezone in KOrganizer.
........

r1004698 | tmcguire | 2009-07-30 20:38:17 +0200 (Thu, 30 Jul 2009) | 10 lines

SVN_MERGE
Merged revisions 1002869 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1002869 | tilladam | 2009-07-27 09:34:43 +0200 (Mon, 27 Jul 2009) | 1 line

  Remove the korganizer specific timezone setting option. This is a view option now, the main timezone is configured in KConfig.
........

r1004700 | tmcguire | 2009-07-30 20:41:35 +0200 (Thu, 30 Jul 2009) | 13 lines

Block this cyclic merge
SVN_SILENT
Blocked revisions 1003207 via svnmerge

........
  r1003207 | winterz | 2009-07-27 22:56:39 +0200 (Mon, 27 Jul 2009) | 5 lines

  merge SVN commit 1003149 by winterz:

  When showing the to-do editor from KMail, customize it a little bit and don't
  enable the [Apply] button.  This fixes a kolab/issue3759.
........

r1004702 | tmcguire | 2009-07-30 20:44:26 +0200 (Thu, 30 Jul 2009) | 11 lines

Icon logging never  made it into trunk
SVN_SILENT
SVN_MERGE
Blocked revisions 1001464 via svnmerge

........
  r1001464 | mutz | 2009-07-23 13:07:59 +0200 (Thu, 23 Jul 2009) | 1 line

  Remove icon usage logging again
........

r1004704 | tmcguire | 2009-07-30 20:46:08 +0200 (Thu, 30 Jul 2009) | 10 lines

SVN_MERGE
Merged revisions 1001465 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1001465 | mutz | 2009-07-23 13:11:21 +0200 (Thu, 23 Jul 2009) | 1 line

  Exchange toolbar actions
........

r1004707 | tmcguire | 2009-07-30 20:50:27 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1003538 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1003538 | mutz | 2009-07-28 11:59:48 +0200 (Tue, 28 Jul 2009) | 1 line

  Disable gpg-agent connectivity test on Windows, as gpg-agent is started on-demand by all tools there
........
SVN_MERGE

r1004708 | tmcguire | 2009-07-30 20:51:01 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1003665 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1003665 | mutz | 2009-07-28 16:57:22 +0200 (Tue, 28 Jul 2009) | 1 line

  SmartCard::ReaderStatus: try to determine whether there're keys on the card to learn.
........
SVN_MERGE

r1004709 | tmcguire | 2009-07-30 20:51:41 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1003668 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1003668 | mutz | 2009-07-28 17:08:02 +0200 (Tue, 28 Jul 2009) | 1 line

  SmartCard::ReaderStatus: also get card details when scdeamon's reader_0.status contains "PRESENT"
........
SVN_MERGE

r1004710 | tmcguire | 2009-07-30 20:52:23 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004070 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004070 | mutz | 2009-07-29 11:48:04 +0200 (Wed, 29 Jul 2009) | 1 line

  AppearanceConfigWidget: don't remove the permission to set an icon when reverting to the default appearance
........
SVN_MERGE

r1004711 | tmcguire | 2009-07-30 20:53:17 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004071 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004071 | mutz | 2009-07-29 11:49:06 +0200 (Wed, 29 Jul 2009) | 1 line

  AppearanceConfigWidget: cleanup: --warnings
........
SVN_MERGE

r1004712 | tmcguire | 2009-07-30 20:54:00 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004074 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004074 | mutz | 2009-07-29 11:59:20 +0200 (Wed, 29 Jul 2009) | 1 line

  AppearanceConfigWidget: fix missing changed()  emission, leading to icon changes not being saved if they were the only changes
........
SVN_MERGE

r1004713 | tmcguire | 2009-07-30 20:54:42 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004136 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004136 | mutz | 2009-07-29 14:15:55 +0200 (Wed, 29 Jul 2009) | 1 line

  SmartCard::ReaderStatus: fix detection of CardCanLearnKeys state
........
SVN_MERGE

r1004714 | tmcguire | 2009-07-30 20:55:24 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004138 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004138 | mutz | 2009-07-29 14:26:56 +0200 (Wed, 29 Jul 2009) | 1 line

  cleanup
........
SVN_MERGE

r1004716 | tmcguire | 2009-07-30 20:56:09 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004139 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004139 | mutz | 2009-07-29 14:27:35 +0200 (Wed, 29 Jul 2009) | 1 line

  SmartCard::ReaderStatus: add qRegisterMetaType() call for QueuedConnection.
........
SVN_MERGE

r1004720 | tmcguire | 2009-07-30 21:00:37 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004154 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004154 | mutz | 2009-07-29 14:56:31 +0200 (Wed, 29 Jul 2009) | 1 line

  SmartCard::ReaderStatus: Allow non-fs-watcher status update triggers
........
SVN_MERGE

r1004721 | tmcguire | 2009-07-30 21:01:21 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004156 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004156 | mutz | 2009-07-29 14:58:11 +0200 (Wed, 29 Jul 2009) | 1 line

  LearnCardKeysCommand: new command to learn a smartcard's keys
........
SVN_MERGE

r1004722 | tmcguire | 2009-07-30 21:02:09 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004171 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004171 | mutz | 2009-07-29 15:44:28 +0200 (Wed, 29 Jul 2009) | 1 line

  ImportCertificateFromClipboardCommand: new command to import the contents of the clipboard as a certificate
........
SVN_MERGE

r1004723 | tmcguire | 2009-07-30 21:03:10 +0200 (Thu, 30 Jul 2009) | 10 lines

Merged revisions 1004201 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1004201 | mutz | 2009-07-29 17:18:58 +0200 (Wed, 29 Jul 2009) | 1 line

  KeyFilterImplBase::matches(): fix != where == would be correct. Extract Method is_card_key()
........
SVN_MERGE

r1004747 | tmcguire | 2009-07-30 21:30:25 +0200 (Thu, 30 Jul 2009) | 21 lines

SVN_MERGE
Merged revisions 1004635 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1004635 | tmcguire | 2009-07-30 18:48:44 +0200 (Thu, 30 Jul 2009) | 13 lines

  Merged revisions 1004609 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

  ........
    r1004609 | tmcguire | 2009-07-30 17:45:49 +0200 (Thu, 30 Jul 2009) | 6 lines

    Share the object tree in the template parser when doing operations on it.
    This removes unnecessary parsing of the object tree, which would lead to multiple passphrase dialogs.

    MERGE: e4, trunk
    kolab/issue3725
  ........
................

r1004765 | tmcguire | 2009-07-30 22:16:28 +0200 (Thu, 30 Jul 2009) | 7 lines

Make it work properly, before it quoted the wrong message.

Makes me wonder why it does work in e35 and e4, but probably because the composer can't change
the template there.

MERGE: e35, e4

r1004816 | krake | 2009-07-31 01:56:02 +0200 (Fri, 31 Jul 2009) | 4 lines

KPIM::KPimPrefs::timeSpec() -> KSystemTimeZones::local() like suggested by rev 1004696

CCMAIL: mcguire@kde.org

r1004818 | ahartmetz | 2009-07-31 02:11:51 +0200 (Fri, 31 Jul 2009) | 5 lines

Build fix, imitating krake here...
KPIM::KPimPrefs::timeSpec() -> KSystemTimeZones::local() like suggested by rev 1004696
This also rearranges some includes alphabetically.
CCMAIL: mcguire@kde.org

r1005137 | tmcguire | 2009-07-31 14:21:16 +0200 (Fri, 31 Jul 2009) | 2 lines

Properly reset the status filter combo when changing the folder.

r1005161 | mkoller | 2009-07-31 15:20:04 +0200 (Fri, 31 Jul 2009) | 3 lines

BUG: 137643
make sure HTML mail body does not overlap with "Note" above about HTML mail

r1005208 | tmcguire | 2009-07-31 16:48:00 +0200 (Fri, 31 Jul 2009) | 5 lines

Catch DOM exceptions.
This should at fix Dmitry's crash, although I couldn't reproduce it.

CCMAIL: dpimka@dpimka.org

r1005210 | tmcguire | 2009-07-31 16:50:01 +0200 (Fri, 31 Jul 2009) | 1 line

Fix length of default forward template.

r1005221 | tmcguire | 2009-07-31 17:01:20 +0200 (Fri, 31 Jul 2009) | 2 lines

Remove support for importing legacy phrases, they are from ancient KDE 3 times.

r1005258 | djarvie | 2009-07-31 19:19:30 +0200 (Fri, 31 Jul 2009) | 1 line

Fix semantic tags in i18n strings

r1005278 | djarvie | 2009-07-31 20:19:24 +0200 (Fri, 31 Jul 2009) | 2 lines

Fix compile warnings

r1005283 | djarvie | 2009-07-31 20:30:51 +0200 (Fri, 31 Jul 2009) | 2 lines

Rename localefuncs -> kalocale

r1005304 | stefanek | 2009-07-31 20:59:32 +0200 (Fri, 31 Jul 2009) | 4 lines

Fix the IMAP resource "stall" if a notification
for an unhandled type of change is received.

r1005329 | cgiboudeaux | 2009-07-31 22:06:10 +0200 (Fri, 31 Jul 2009) | 1 line

replyphrases.kcfg doesn't exist anymore

r1005349 | mkoller | 2009-07-31 22:50:11 +0200 (Fri, 31 Jul 2009) | 3 lines

make the snippet tree widget show the groups expanded to make
accessing the snippets easier for the user.

r1005389 | cfeck | 2009-08-01 00:40:30 +0200 (Sat, 01 Aug 2009) | 8 lines

Layout fixes

* QGridLayout -> QFormLayout / QBoxLayout
* remove hardcoded spacings and margins

One minor change to layout is that labels and the font size
sliders are put into same row to make sure it fits in ~800x560

r1005418 | mkoller | 2009-08-01 01:47:30 +0200 (Sat, 01 Aug 2009) | 5 lines

BUG: 51410

Activate signing if switching from an identity without key to an
identity with key and auto-sign option is set,

r1005568 | scripty | 2009-08-01 12:39:26 +0200 (Sat, 01 Aug 2009) | 1 line

SVN_SILENT made messages (.desktop file)

r1005596 | winterz | 2009-08-01 14:33:06 +0200 (Sat, 01 Aug 2009) | 4 lines

provide a feedback messagebox with the status of the export.
MERGE: e35,e4
DO_NOT_BACKPORT: new i18n strings

r1005597 | winterz | 2009-08-01 14:37:45 +0200 (Sat, 01 Aug 2009) | 3 lines

minor coding style fixes
SVN_SILENT:

r1005608 | djarvie | 2009-08-01 15:14:29 +0200 (Sat, 01 Aug 2009) | 1 line

Remove unused forward declaration

r1005612 | winterz | 2009-08-01 15:28:26 +0200 (Sat, 01 Aug 2009) | 5 lines

KUIT
ToolTip and WhatsThis
MERGE: none
DO_NOT_BACKPORT: new i18n strings

r1005613 | winterz | 2009-08-01 15:39:54 +0200 (Sat, 01 Aug 2009) | 5 lines

CamelCase headers
remove unused headers
MERGE: none
DO_NOT_BACKPORT:

r1005622 | winterz | 2009-08-01 16:04:09 +0200 (Sat, 01 Aug 2009) | 5 lines

QLineEdit -> KLineEdit
QComboBox -> KComboBox
MERGE: none
DO_NOT_BACKPORT:

r1005635 | mkoller | 2009-08-01 17:09:01 +0200 (Sat, 01 Aug 2009) | 5 lines

BUG: 52223

escape subject text when generating the tooltip to avoid
using/executing HTML code existing in the subject text

r1005643 | mkoller | 2009-08-01 17:59:04 +0200 (Sat, 01 Aug 2009) | 2 lines

remove dead code

r1005660 | djarvie | 2009-08-01 19:31:40 +0200 (Sat, 01 Aug 2009) | 1 line

Elucidate comment

r1005664 | mkoller | 2009-08-01 19:32:42 +0200 (Sat, 01 Aug 2009) | 5 lines

BUG: 55021

add quote string _after_ lines have been wrapped, which avoids
that our own special quote-string is somewhere inside the then wrapped lines

r1005691 | mkoller | 2009-08-01 21:20:05 +0200 (Sat, 01 Aug 2009) | 7 lines

make "mail to mailing list" action work again also on folders which
do not contain a ML, which then - as was implemented in the slot - creates a
normal new message without a To address.
This make kmail compatible to KDE3 again and it simplifies the toolbar
when a user uses the action "mail to mailing list" for all new mail creation - 
without the need to think about which toolbutton (new mail or new mail to ML) to click...

r1005695 | djarvie | 2009-08-01 21:39:53 +0200 (Sat, 01 Aug 2009) | 2 lines

Move static QStrings into K_GLOBAL_STATIC

r1005697 | mkoller | 2009-08-01 21:43:10 +0200 (Sat, 01 Aug 2009) | 5 lines

BUG: 87549

Set focus on subject field when we open the composer for a mail which
has the To: field set.

r1005702 | mkoller | 2009-08-01 21:49:38 +0200 (Sat, 01 Aug 2009) | 3 lines

Set focus on subject field when we open the composer for a mail which
has the To: field set.

r1005718 | mkoller | 2009-08-01 23:41:32 +0200 (Sat, 01 Aug 2009) | 4 lines

Initialize some missing members and avoid a crash when printing
as there is no actionCollection given to the ctor and therefore
no KActions are available.

r1005724 | djarvie | 2009-08-02 00:47:02 +0200 (Sun, 02 Aug 2009) | 2 lines

Set compiler definition KMAIL_SUPPORTED to fix KMail dependent functions never being compiled.

r1005836 | yurchor | 2009-08-02 12:59:11 +0200 (Sun, 02 Aug 2009) | 1 line

curently->currently

r1005927 | mlaurent | 2009-08-02 17:51:41 +0200 (Sun, 02 Aug 2009) | 2 lines

Pedantic

r1005936 | aacid | 2009-08-02 18:35:58 +0200 (Sun, 02 Aug 2009) | 2 lines

foreach already iterates over values so calling values explicitely is a waste both in memory and processing time

r1006029 | winterz | 2009-08-02 23:08:25 +0200 (Sun, 02 Aug 2009) | 7 lines

Tidy-up. Use lowercase/uppercase as appropriate.
Full tooltips and whatsthis
QTextEdit -> KTextEdit

MERGE: none
DO_NOT_BACKPORT: new i18n strings

r1006033 | winterz | 2009-08-02 23:16:01 +0200 (Sun, 02 Aug 2009) | 5 lines

tell the incidence editor what type of incidence we are editing ("Event", "Todo", "Journal")
so it can do some minor tweaking as necessary.
MERGE: none
DO_NOT_BACKPORT: necessary for new features

r1006034 | winterz | 2009-08-02 23:16:52 +0200 (Sun, 02 Aug 2009) | 3 lines

pass in the incidence type we are editing ("Event" vs. "Todo") so we can provide
a more specific set of alarm choices

r1006037 | winterz | 2009-08-02 23:27:30 +0200 (Sun, 02 Aug 2009) | 3 lines

CamelCase headers
remove unused headers

r1006038 | winterz | 2009-08-02 23:29:12 +0200 (Sun, 02 Aug 2009) | 2 lines

remove KCal:: since we are using it now

r1006044 | winterz | 2009-08-02 23:52:04 +0200 (Sun, 02 Aug 2009) | 3 lines

CamelCase headers
remove unused headers and forward class declarations

r1006054 | winterz | 2009-08-03 00:23:55 +0200 (Mon, 03 Aug 2009) | 3 lines

don't show the Advanced reminder button unless reminders are checked-on
MERGE: e4,4.3.1

r1006071 | winterz | 2009-08-03 01:11:20 +0200 (Mon, 03 Aug 2009) | 4 lines

put the initial focus on the time interval spinbox
BUG: 143197
MERGE: e4,4.3.1

r1006239 | skelly | 2009-08-03 11:53:04 +0200 (Mon, 03 Aug 2009) | 1 line

Fetch more items from the model only when a collection is clicked, not when it is expanded.

r1006242 | skelly | 2009-08-03 11:53:49 +0200 (Mon, 03 Aug 2009) | 1 line

Return the getColumnCount from the super class if the BrowserModel can't handle it

r1006243 | skelly | 2009-08-03 11:53:58 +0200 (Mon, 03 Aug 2009) | 1 line

Fix whitespace errors

r1006250 | skelly | 2009-08-03 12:09:13 +0200 (Mon, 03 Aug 2009) | 3 lines

ParentCollection > ParentCollectionRole.

SVN_SILENT

r1006346 | vkrause | 2009-08-03 16:28:24 +0200 (Mon, 03 Aug 2009) | 3 lines

ETM gives us a valid item only for the first column, so use that one.
This fixes item selection when clicking on any other column.