Skip to content
  • Volker Krause's avatar
    SVN_MERGE · bac5ad3a
    Volker Krause authored
    Merged revisions 1136706,1136717,1136721,1136723,1136731,1136733,1136740,1136749,1136752,1136754,1136765,1136770,1136773-1136774,1136784,1136806,1136819-1136820,1136827,1136846,1136850,1136856-1136857,1136865,1136885-1136886 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ................
      r1136706 | mlaurent | 2010-06-10 15:58:00 +0200 (Thu, 10 Jun 2010) | 2 lines
      
      Migrate "kcmkmailsummaryrc" too.
    ................
      r1136717 | krake | 2010-06-10 16:39:05 +0200 (Thu, 10 Jun 2010) | 2 lines
      
      Improve check for when being finished. Once the explicit fetch job has run and there are no more collections to process, we are finished
    ................
      r1136721 | krake | 2010-06-10 16:44:46 +0200 (Thu, 10 Jun 2010) | 4 lines
      
      Index files become invalid when operations on folders change timestamps.
      Since we can't be sure that collections have at least been synchronized once, thus the index data having been copied to Akonadi, we have to do a full synchronize whenever we work on a new path.
      Otherwise situations like a POP3 resource writing into Inbox would invalidate all flags/tags of other messages in Inbox.
    ................
      r1136723 | krake | 2010-06-10 16:49:37 +0200 (Thu, 10 Jun 2010) | 2 lines
      
      Committing the non-GUI portions of the migrated "Include in manual checks" functionality
    ................
      r1136731 | mlaurent | 2010-06-10 17:37:58 +0200 (Thu, 10 Jun 2010) | 3 lines
      
      Manual check is implemented in kmail directly.
      Not necessary to keep hidden config here
    ................
      r1136733 | krake | 2010-06-10 17:57:30 +0200 (Thu, 10 Jun 2010) | 2 lines
      
      Do not show agent notifications as our status or progress when a collection migrator is signalling its status/progress
    ................
      r1136740 | krake | 2010-06-10 18:12:15 +0200 (Thu, 10 Jun 2010) | 4 lines
      
      Write per resource "check on startup" config entries.
      Set per resource config for mbox and maildir accounts.
      Exclude "KMail folders" from manual checks and startup checks
    ................
      r1136749 | krake | 2010-06-10 18:34:11 +0200 (Thu, 10 Jun 2010) | 2 lines
      
      Non-GUI parts of per-resource "check mail on startup"
    ................
      r1136752 | winterz | 2010-06-10 18:39:49 +0200 (Thu, 10 Jun 2010) | 12 lines
      
      SVN_SILENT:
      Blocked revisions 1136750 via svnmerge
      
      ........
        r1136750 | winterz | 2010-06-10 12:35:09 -0400 (Thu, 10 Jun 2010) | 5 lines
        
        put in a hack to determine if the last byte of a base64decoded QByteArray
        is zero; if so, truncate away that last byte.
        kolab/issue4407
        MERGE: none
      ........
    ................
      r1136754 | krake | 2010-06-10 18:42:22 +0200 (Thu, 10 Jun 2010) | 6 lines
      
      Create a pre-resource "offline on status" config entry.
      
      Set it to true for IMAP and POP3.
      While this is not ideal given Akonadi's capabilities, it follows the principle of least surprise.
    ................
      r1136765 | krake | 2010-06-10 19:06:55 +0200 (Thu, 10 Jun 2010) | 4 lines
      
      If the pre-resource config entry OfflineOnShutdown is true, take the resource offline when KMail quits.
      If such a resource is offline when KMail starts, try switching it to online.
      Should make the overall behavior mostly indistinguishable from KMail1
    ................
      r1136770 | mlaurent | 2010-06-10 19:11:19 +0200 (Thu, 10 Jun 2010) | 2 lines
      
      const'ify
    ................
      r1136773 | winterz | 2010-06-10 19:17:10 +0200 (Thu, 10 Jun 2010) | 7 lines
      
      merge forward SVN commit 1136768 by winterz:
      
      in CalPrintTodos::print(), increase the distance between the "Priority"
      and "Summary" header prints so they have less chance of overlapping
      in different translations.  Also use a smaller font for the header prints.
      kolab/issue4414
    ................
      r1136774 | winterz | 2010-06-10 19:19:12 +0200 (Thu, 10 Jun 2010) | 14 lines
      
      SVN_SILENT:
      Recorded merge of revisions 1136768 via svnmerge from 
      https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
      
      ........
        r1136768 | winterz | 2010-06-10 13:10:10 -0400 (Thu, 10 Jun 2010) | 6 lines
        
        in CalPrintTodos::print(), increase the distance between the "Priority"
        and "Summary" header prints so they have less chance of overlapping
        in different translations.  Also use a smaller font for the header prints.
        kolab/issue4414
        MERGE: trunk,4.4 (only part)
      ........
    ................
      r1136784 | winterz | 2010-06-10 19:57:41 +0200 (Thu, 10 Jun 2010) | 11 lines
      
      SVN_SILENT:
      Blocked revisions 1136782 via svnmerge
      
      ........
        r1136782 | winterz | 2010-06-10 13:52:47 -0400 (Thu, 10 Jun 2010) | 5 lines
        
        unless using the Print context menu, always set the print type to TodoList.
        kolab/issue4413
        MERGE: none
      ........
    ................
      r1136806 | djarvie | 2010-06-10 22:07:18 +0200 (Thu, 10 Jun 2010) | 4 lines
      
      Rename KCalendar -> KACalendar.
      Rename KCalendar::Status -> KACalendar::Compat.
      Move calendar compatibility checking code into KACalendar to allow Akonadi code to access it.
    ................
      r1136819 | link | 2010-06-10 22:52:15 +0200 (Thu, 10 Jun 2010) | 1 line
      
      kmail: add a delegate for listing resources with a kmail specific option button.
    ................
      r1136820 | link | 2010-06-10 22:52:44 +0200 (Thu, 10 Jun 2010) | 9 lines
      
      configure dialog: use the previously committed delegate to add retrieval options
      
      Ref. thread in the ML:"Review Request: Migrate KMail's "Include in manual mail checks""
      This adds the GUI bits for the following per-resource options:
      * Include/Exclude a resource from the manual mail check
      * Include/Exclude a resource from the startup check
      * Offline a resource when kmail shuts down.
      
      This is the GUI counterpart to r1136749 by Kevin K.
    ................
      r1136827 | link | 2010-06-10 23:07:20 +0200 (Thu, 10 Jun 2010) | 1 line
      
      configure dialog: add missing i18ns
    ................
      r1136846 | lfranchi | 2010-06-11 00:26:32 +0200 (Fri, 11 Jun 2010) | 2 lines
      
      Refactor some logic from KMComposeWin into libmessagecomposer, so it can be shared with kmail-mobile. Functionality of desktop kmail should be unchanged.
    ................
      r1136850 | winterz | 2010-06-11 00:50:21 +0200 (Fri, 11 Jun 2010) | 9 lines
      
      SVN_SILENT:
      Blocked revisions 1136816 via svnmerge
      
      ........
        r1136816 | smartins | 2010-06-10 16:38:26 -0400 (Thu, 10 Jun 2010) | 2 lines
        
        compile with gcc 4.5
      ........
    ................
      r1136856 | winterz | 2010-06-11 01:14:33 +0200 (Fri, 11 Jun 2010) | 15 lines
      
      merge forward SVN commit 1136855 by winterz:
      
      [NOTE: someone already noticed this problem in trunk and used s_left
      and s_right instead of shadow_left and shadow_right. but I think that
      looks bad. So, I chose to remove the background_image: here too]
      
      remove the css background-image setting from the enterprise header 
      to use the enterprise_shadow_left and enterprise_shadow_right images.
      since there aren't any such images with those names in existence.
      and the enterprise header looks fine the way it is.
      
      effectively, this just eliminates warning messages like:
      kio (KIOJob): error 11 /path/to/share/apps/kmail/pics/enterprise_shadow_left.png
    ................
      r1136857 | winterz | 2010-06-11 01:18:41 +0200 (Fri, 11 Jun 2010) | 18 lines
      
      SVN_SILENT:
      Recorded merge of revisions 1136855 via svnmerge from 
      https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
      
      ........
        r1136855 | winterz | 2010-06-10 19:09:57 -0400 (Thu, 10 Jun 2010) | 10 lines
        
        remove the css background-image setting from the enterprise header 
        to use the enterprise_shadow_left and enterprise_shadow_right images.
        since there aren't any such images with those names in existence.
        and the enterprise header looks fine the way it is.
        
        effectively, this just eliminates warning messages like:
        kio (KIOJob): error 11 /path/to/share/apps/kmail/pics/enterprise_shadow_left.png
        
        MERGE: trunk,4.4
      ........
    ................
      r1136865 | lfranchi | 2010-06-11 01:33:20 +0200 (Fri, 11 Jun 2010) | 3 lines
      
      Fix date on encrypted messages with secondary recipients.
      Fix slot to actually be a slot..
    ................
      r1136885 | link | 2010-06-11 04:03:16 +0200 (Fri, 11 Jun 2010) | 3 lines
      
      configure dialog: retrieval options setting now follows the make changes -> emit changed -> save on apply/ok model
      
      before it was reading and writing to the config each tim the user clicked the button
    ................
      r1136886 | link | 2010-06-11 04:03:24 +0200 (Fri, 11 Jun 2010) | 1 line
      
      cleanup.. not sure how this happened
    ................
    
    svn path=/branches/work/komo/kdepim/runtime/; revision=1136936
    bac5ad3a