Merged revisions 1136206-1136207,1136213,1136219,1136236,1136245,1136254,1136259,1136261-1136262,1136264,1136277,1136284-1136286,1136318,1136328,1136330-1136331,1136354,1136359,1136373,1136375,1136380,1136386,1136630,1136633,1136644-1136646,1136668,1136670,1136672 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
................
r1136206 | mlaurent | 2010-06-09 10:12:12 +0200 (Wed, 09 Jun 2010) | 2 lines
In kmail2 QuotaUnit is not necessary
................
r1136207 | mlaurent | 2010-06-09 10:13:59 +0200 (Wed, 09 Jun 2010) | 2 lines
Bye bye default-mailbox-format too
................
r1136213 | tilladam | 2010-06-09 10:18:36 +0200 (Wed, 09 Jun 2010) | 4 lines
Make it possible to use a distinct selection model in the foldertreewidget.
In the folderrequester, we don't want to trigger collection fetches when
we select a folder. So avoid that, by using a distinct selection model.
................
r1136219 | tilladam | 2010-06-09 10:37:22 +0200 (Wed, 09 Jun 2010) | 1 line
Avoid unnessecary modify jobs.
................
r1136236 | mlaurent | 2010-06-09 11:38:50 +0200 (Wed, 09 Jun 2010) | 2 lines
Fix error in text
................
r1136245 | mlaurent | 2010-06-09 12:06:10 +0200 (Wed, 09 Jun 2010) | 2 lines
Fix crash
................
r1136254 | mlaurent | 2010-06-09 12:30:01 +0200 (Wed, 09 Jun 2010) | 2 lines
Fix app icon name
................
r1136259 | smartins | 2010-06-09 12:53:21 +0200 (Wed, 09 Jun 2010) | 2 lines
emit signal when collection changes so application knows when access rights changed.
................
r1136261 | smartins | 2010-06-09 12:57:03 +0200 (Wed, 09 Jun 2010) | 2 lines
make collectionFromModel work with tree models.
................
r1136262 | krake | 2010-06-09 13:02:13 +0200 (Wed, 09 Jun 2010) | 2 lines
Do not overwrite error text from folderForCollectionMethod, otherwise the reported path is non-sense
................
r1136264 | krake | 2010-06-09 13:06:04 +0200 (Wed, 09 Jun 2010) | 3 lines
Disable interval checking on IMAP resources before runing the imapcache importer and enable it (if configured) when the importer has finished.
Otherwise the resource will start downloading folders the importer hasn't processed yet
................
r1136277 | smartins | 2010-06-09 13:51:22 +0200 (Wed, 09 Jun 2010) | 2 lines
remove warning, incidence->readOnly() isn't part of the payload
................
r1136284 | winterz | 2010-06-09 14:18:07 +0200 (Wed, 09 Jun 2010) | 10 lines
SVN_SILENT:
Blocked revisions 1136283 via svnmerge
........
r1136283 | winterz | 2010-06-09 08:16:49 -0400 (Wed, 09 Jun 2010) | 4 lines
Remove groupwise and groupdav kresources and adjust the wizard accordingly
MERGE: none
........
................
r1136285 | winterz | 2010-06-09 14:19:42 +0200 (Wed, 09 Jun 2010) | 9 lines
SVN_SILENT:
Blocked revisions 1135917 via svnmerge
........
r1135917 | ludwigreiter | 2010-06-08 06:18:07 -0400 (Tue, 08 Jun 2010) | 1 line
Update after test of the 2010-06-04 newslog
........
................
r1136286 | winterz | 2010-06-09 14:20:43 +0200 (Wed, 09 Jun 2010) | 14 lines
SVN_SILENT:
Recorded merge of revisions 1136056 via svnmerge from
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
........
r1136056 | winterz | 2010-06-08 16:38:15 -0400 (Tue, 08 Jun 2010) | 6 lines
when dropping plain old text of emails, decode the whole thing
so we don't lose out on the displayName, comments, etc.
kolab/issue341l
MERGE: trunk
........
................
r1136318 | mlaurent | 2010-06-09 15:44:38 +0200 (Wed, 09 Jun 2010) | 2 lines
I don't delete cache after but I want to finish import :)
................
r1136328 | mlaurent | 2010-06-09 16:20:15 +0200 (Wed, 09 Jun 2010) | 2 lines
Add missing conversion
................
r1136330 | krake | 2010-06-09 16:24:04 +0200 (Wed, 09 Jun 2010) | 3 lines
Skip IMAP folders on import when they or one of their ancestors have been locally unsubscribed.
Still need to unsubscribe them with Akonadi
................
r1136331 | krake | 2010-06-09 16:27:11 +0200 (Wed, 09 Jun 2010) | 3 lines
Ups, wrong object
................
r1136354 | krake | 2010-06-09 17:41:06 +0200 (Wed, 09 Jun 2010) | 2 lines
Locally unsubscribe collections for IMAP folders which were unsubscribed locally
................
r1136359 | krake | 2010-06-09 17:58:08 +0200 (Wed, 09 Jun 2010) | 2 lines
Need to specifically enable interval checking
................
r1136373 | lueck | 2010-06-09 18:38:38 +0200 (Wed, 09 Jun 2010) | 1 line
typo fix spotted by Freek de Kruijf
................
r1136375 | krake | 2010-06-09 18:47:57 +0200 (Wed, 09 Jun 2010) | 2 lines
Make migratePassword() a member function so we can keep the Wallet instance and don't bother the user with wallet password input for every single resource that gets its password migrated
................
r1136380 | krake | 2010-06-09 18:58:29 +0200 (Wed, 09 Jun 2010) | 2 lines
Oops, revert local test config
................
r1136386 | mlaurent | 2010-06-09 19:11:38 +0200 (Wed, 09 Jun 2010) | 4 lines
Migrate Trash/Folder destination for resources.
Now I think that all is migrated
................
r1136630 | mlaurent | 2010-06-10 11:09:48 +0200 (Thu, 10 Jun 2010) | 2 lines
Fix duplicate code
................
r1136633 | mlaurent | 2010-06-10 11:26:54 +0200 (Thu, 10 Jun 2010) | 2 lines
not necessary
................
r1136644 | mlaurent | 2010-06-10 12:25:38 +0200 (Thu, 10 Jun 2010) | 2 lines
Add missing slot
................
r1136645 | mlaurent | 2010-06-10 12:38:51 +0200 (Thu, 10 Jun 2010) | 2 lines
Fix crash when we try to rename a not item
................
r1136646 | mlaurent | 2010-06-10 12:41:06 +0200 (Thu, 10 Jun 2010) | 2 lines
Fix crash
................
r1136668 | mlaurent | 2010-06-10 14:16:40 +0200 (Thu, 10 Jun 2010) | 2 lines
All is done
................
r1136670 | mlaurent | 2010-06-10 14:24:22 +0200 (Thu, 10 Jun 2010) | 2 lines
Kevin is right. We can remove it. all is perfect now :) (we hope :) )
................
r1136672 | cgiboudeaux | 2010-06-10 14:29:59 +0200 (Thu, 10 Jun 2010) | 6 lines
"Fix the icons and shortcuts with RTL.
BUG: 205288
MERGE:4.4
FIXED-IN: 1.6.5
................
svn path=/branches/work/komo/kdepim/; revision=1136705
Merged revisions 1133711,1133743-1133744,1133749,1133751,1133763,1133766-1133767,1133774,1133793,1133798,1133805,1133833,1133849,1133852,1133862,1133866,1133871,1133884,1133900,1133905,1133918,1133920,1133928,1133936,1133943,1133947-1133950,1133974-1133976,1133986-1133988,1133992-1133995,1133997,1134013 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
........
r1133711 | krake | 2010-06-02 11:11:35 +0200 (Wed, 02 Jun 2010) | 2 lines
Complete change to new KMail config file kmail2rc
........
r1133743 | krake | 2010-06-02 12:54:30 +0200 (Wed, 02 Jun 2010) | 2 lines
The config file name is kmail2rc now
........
r1133744 | krake | 2010-06-02 13:00:13 +0200 (Wed, 02 Jun 2010) | 2 lines
Check if there is an old KMail config or KMail data directory so we don't needlessly run the migrator on totally new setups
........
r1133749 | smartins | 2010-06-02 13:24:05 +0200 (Wed, 02 Jun 2010) | 4 lines
We don't open new windows that bypass akonadi now.
BUG: 232296
........
r1133751 | krake | 2010-06-02 13:30:45 +0200 (Wed, 02 Jun 2010) | 2 lines
We cannot know how long the migrator will need, we definitely cannot be sure it will be finished in 30 seconds (the default of waitForFinished)
........
r1133763 | krake | 2010-06-02 14:04:54 +0200 (Wed, 02 Jun 2010) | 2 lines
Data dir also changes to "kmail2" because this is the aboutdata's appname
........
r1133766 | smartins | 2010-06-02 14:21:36 +0200 (Wed, 02 Jun 2010) | 2 lines
Remove text/calendar mimetype from the monitor so free/busy isn't included.
........
r1133767 | smartins | 2010-06-02 14:24:41 +0200 (Wed, 02 Jun 2010) | 2 lines
Remove text/calendar mimetype from the monitor so free/busy isn't included.
........
r1133774 | mlaurent | 2010-06-02 14:31:57 +0200 (Wed, 02 Jun 2010) | 2 lines
Minor fix
........
r1133793 | krake | 2010-06-02 15:45:19 +0200 (Wed, 02 Jun 2010) | 2 lines
Get rid of the warnings triggered by kDebug() usage
........
r1133798 | lfranchi | 2010-06-02 15:49:56 +0200 (Wed, 02 Jun 2010) | 4 lines
Add Urgent headers if user selected Urget action.
BUG: 238104
........
r1133805 | krake | 2010-06-02 16:06:16 +0200 (Wed, 02 Jun 2010) | 2 lines
Move special mail collection handling into the base class to share modify job handling with custom folder icon migration
........
r1133833 | lfranchi | 2010-06-02 17:53:51 +0200 (Wed, 02 Jun 2010) | 4 lines
Only enable Copy action when some text is selected in the viewer
CCBUG: 223820
........
r1133849 | mlaurent | 2010-06-02 18:55:56 +0200 (Wed, 02 Jun 2010) | 2 lines
Add debug
........
r1133852 | mlaurent | 2010-06-02 19:04:29 +0200 (Wed, 02 Jun 2010) | 2 lines
Add info here. We mustn't modify kmail2rc but akonadi*resouce*
........
r1133862 | smartins | 2010-06-02 19:41:11 +0200 (Wed, 02 Jun 2010) | 2 lines
Remove TODO. Bug fixed by skelly.
........
r1133866 | krake | 2010-06-02 19:49:09 +0200 (Wed, 02 Jun 2010) | 2 lines
If accounts have trash folders configured, set them to that special collections type
........
r1133871 | smartins | 2010-06-02 19:54:09 +0200 (Wed, 02 Jun 2010) | 7 lines
SVN_SILENT:
Just style stuff before i commit a nice patch.
Remove 4 space identation, use 2 instead.
........
r1133884 | smartins | 2010-06-02 20:21:46 +0200 (Wed, 02 Jun 2010) | 9 lines
Finally found the cause behind events not appearing at startup from time to time.
Race between the model used by AkonadiCollectionView and calendarSearch's model, when the first model's selection model
gets an item selected calendarSearch's model might not know about the collection yet.
BUG: 237153
........
r1133900 | smartins | 2010-06-02 22:04:51 +0200 (Wed, 02 Jun 2010) | 2 lines
Stay quiet when parent didn't change
........
r1133905 | lfranchi | 2010-06-02 22:09:46 +0200 (Wed, 02 Jun 2010) | 5 lines
Make context menus a bit smarter, and show more relevant entries. Could use more cleanup too.
BUG: 223480
CCBUG: 223486
........
r1133918 | smartins | 2010-06-02 22:41:49 +0200 (Wed, 02 Jun 2010) | 2 lines
Stay quiet when nothing is inserted.
........
r1133920 | djarvie | 2010-06-02 22:54:24 +0200 (Wed, 02 Jun 2010) | 3 lines
Fix loss of time zone specification for date only alarms when converting a
pre-2.3.2 calendar, if start-of-day time in calendar is not midnight.
........
r1133928 | lfranchi | 2010-06-02 23:31:15 +0200 (Wed, 02 Jun 2010) | 2 lines
When a default collection changes, make sure our specialcollection still has one, and if not, find the newly created one.
........
r1133936 | lfranchi | 2010-06-03 00:04:34 +0200 (Thu, 03 Jun 2010) | 4 lines
clear cache of specialcollection folder ids when fetching new ones
BUG: 1133929
........
r1133943 | lfranchi | 2010-06-03 00:30:33 +0200 (Thu, 03 Jun 2010) | 2 lines
only show Move To Trash in folder context menu if selected folder is not the trash
........
r1133947 | link | 2010-06-03 01:28:43 +0200 (Thu, 03 Jun 2010) | 1 line
Be more forgiving of user input. Trim the server field of whitespace before working with it.
........
r1133948 | link | 2010-06-03 01:28:47 +0200 (Thu, 03 Jun 2010) | 1 line
trimm the email field before working with it
........
r1133949 | link | 2010-06-03 01:28:50 +0200 (Thu, 03 Jun 2010) | 5 lines
I don't know why, but the ecmascript interpreter kross uses does not have a trim() function
for strings, so this commit adds one and uses it in the appropriate places. Of course since
each script is independent it has to be added to each wizard.
Trimming user input prevents many copy/paste errors.
........
r1133950 | djarvie | 2010-06-03 01:31:33 +0200 (Thu, 03 Jun 2010) | 2 lines
Remove unnecessary startOfDay parameter
........
r1133974 | link | 2010-06-03 03:31:27 +0200 (Thu, 03 Jun 2010) | 1 line
warnings--
........
r1133975 | link | 2010-06-03 03:31:31 +0200 (Thu, 03 Jun 2010) | 1 line
Run the server test and change the settings appropriately before accept()ing the imap config dialog.
........
r1133976 | link | 2010-06-03 03:31:33 +0200 (Thu, 03 Jun 2010) | 1 line
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
........
r1133986 | link | 2010-06-03 04:16:44 +0200 (Thu, 03 Jun 2010) | 1 line
remove stale connect()s
........
r1133987 | link | 2010-06-03 04:16:47 +0200 (Thu, 03 Jun 2010) | 1 line
imap resource: Prevent two KWallet password prompts from being shown consecutively.
........
r1133988 | link | 2010-06-03 04:16:50 +0200 (Thu, 03 Jun 2010) | 5 lines
imap resource: Remove the passwordPossible() method because it is redundant.
The password() method takes a pointer to a bool that is set if the password fetching is not possible. Besides,
calling passwordPossible() followed by password() will result in two KWallet prompts to the user in short
succession, which is very annoying.
........
r1133992 | link | 2010-06-03 04:58:59 +0200 (Thu, 03 Jun 2010) | 1 line
pop3 resource: delete the wallet pointer. memleak--
........
r1133993 | link | 2010-06-03 04:59:02 +0200 (Thu, 03 Jun 2010) | 1 line
pop3 resource: fix comment
........
r1133994 | link | 2010-06-03 04:59:06 +0200 (Thu, 03 Jun 2010) | 1 line
pop3 resource: keep the wallet open to prevent multiple password prompts when configuring the resource
........
r1133995 | link | 2010-06-03 04:59:09 +0200 (Thu, 03 Jun 2010) | 3 lines
imap resource: add a validator to the imap host field
doh, should have used this from the beginning!
........
r1133997 | winterz | 2010-06-03 05:09:25 +0200 (Thu, 03 Jun 2010) | 5 lines
forward port SVN commit 1133996 by winterz:
change the Exec command to use --encrypt-sign rather than --sign-encrypt
CCBUG: 240536
........
r1134013 | tokoe | 2010-06-03 08:14:27 +0200 (Thu, 03 Jun 2010) | 3 lines
Copy hasMyWritableEventsFolders from KCal::CalHelper, since
bodypart formatter is the only user
........
svn path=/branches/work/komo/kdepim/; revision=1134025
- Updating them to 2010
- Legally enforceable Copyright message incl. symbol (hopefully OK for must jurisdictions)
- Use actual names where possible (= if defined in the headers)
- Use "authors" instead of "developers" when referring to a group of people to match the tab in the about window
svn path=/trunk/KDE/kdepim/knode/; revision=1106345