Skip to content
  • Volker Krause's avatar
    SVN_MERGE · 44de7342
    Volker Krause authored
    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/runtime/; revision=1134025
    44de7342