Home GnuPG

SVN_MERGE Merged revisions 1134048,1134061,1134093-1134094,1134125,1134142…
465e0e9eb8f3Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE Merged revisions 1134048,1134061,1134093-1134094,1134125,1134142,1134146-1134147,1134150,1134156-1134157,1134159-1134162,1134166 via svnmerge from https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

........

r1134048 | bricks | 2010-06-03 11:23:07 +0200 (Thu, 03 Jun 2010) | 3 lines

merged 1134040 into trunk
hide akonadi resources from mac os dock

........

r1134061 | krake | 2010-06-03 12:17:39 +0200 (Thu, 03 Jun 2010) | 3 lines

Fixing migration of Kolab resources.

........

r1134093 | smartins | 2010-06-03 13:56:18 +0200 (Thu, 03 Jun 2010) | 5 lines

Do not show events before setDates() was called, otherwise we
see day view date for some milisecs then weekview.

........

r1134094 | mlaurent | 2010-06-03 14:06:57 +0200 (Thu, 03 Jun 2010) | 2 lines

Fix migrate favorite collection

........

r1134125 | smartins | 2010-06-03 15:09:21 +0200 (Thu, 03 Jun 2010) | 4 lines

Don't delete all KOAgendaViews and create them again when we change an incidence.

Seems overkill.

........

r1134142 | lfranchi | 2010-06-03 16:16:54 +0200 (Thu, 03 Jun 2010) | 2 lines

Fix typo.

........

r1134146 | link | 2010-06-03 16:26:27 +0200 (Thu, 03 Jun 2010) | 1 line

imap resource: remove the trimmed() calls, because wiith the QRegExpValidator they are unnecessary

........

r1134147 | link | 2010-06-03 16:26:38 +0200 (Thu, 03 Jun 2010) | 3 lines

kolab resource: change default authentication type to plain when using ssl.

BUG: 240586

........

r1134150 | smartins | 2010-06-03 16:29:40 +0200 (Thu, 03 Jun 2010) | 2 lines

add debug info for a crash

........

r1134156 | djarvie | 2010-06-03 16:40:55 +0200 (Thu, 03 Jun 2010) | 3 lines

Refactor detection of calendar format version, to make the function available to
Akonadi resource.

........

r1134157 | smartins | 2010-06-03 16:41:27 +0200 (Thu, 03 Jun 2010) | 2 lines

More debug, we're almost there.

........

r1134159 | lfranchi | 2010-06-03 16:43:28 +0200 (Thu, 03 Jun 2010) | 4 lines

Properly set the right charset. If the user selects a charset, use that one first. If Force Charset is on, use that as a fallback if the user hasn't explicitly chosen another one.

BUG: 238632

........

r1134160 | lfranchi | 2010-06-03 16:45:01 +0200 (Thu, 03 Jun 2010) | 2 lines

initialize to false

........

r1134161 | djarvie | 2010-06-03 16:46:48 +0200 (Thu, 03 Jun 2010) | 2 lines

Suppress resource-related deprecated warnings for non-Akonadi build.

........

r1134162 | link | 2010-06-03 16:48:18 +0200 (Thu, 03 Jun 2010) | 11 lines

Revert the automatic running of the server test.
As ervin pointed out there are two cases where this breaks the user's expectation:
1) user checks that default conn settings are OK and doesn't touch them
2) later on post-initial config the user is editing an innocuous setting (e.g., mail interval)

Revert "If the user manually changes the advanced connection settings, don't run the test as obviously (we hope) he/she knows what he is doing. This is all really a pre-cursor to the "Test Settings" feature. See bug 239893"
Revert "Run the server test and change the settings appropriately before accept()ing the imap config dialog."
Conflicts:

	runtime/resources/imap/setupserver.cpp
	runtime/resources/imap/setupserver.h

........

r1134166 | amantia | 2010-06-03 16:49:53 +0200 (Thu, 03 Jun 2010) | 3 lines

Convert newlines to unix style newlines, that is what KMime expects. Fixes S/MIME decryption.
BUG: 239901

........

svn path=/branches/work/komo/kdepim/; revision=1134177

Event Timeline

Empty Commit

This commit is empty and does not affect any paths.