Skip to content
  • Volker Krause's avatar
    SVN_MERGE · 978b4953
    Volker Krause authored
    Merged revisions 1130548,1130553,1130564,1130598,1130647,1130664,1130667-1130668,1130746,1130755,1130765,1130769,1130788,1130803,1130819,1130868,1130883,1130906,1130926,1131008-1131009,1131082,1131086,1131100,1131107,1131117,1131159-1131160,1131165-1131166,1131168,1131170,1131201,1131220,1131225,1131242-1131243,1131282-1131284,1131297,1131299-1131306,1131453 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ................
      r1130548 | smartins | 2010-05-25 18:47:19 +0200 (Tue, 25 May 2010) | 2 lines
      
      Call QTreeView::mouseReleaseEvent() if we don't want the event.
    ................
      r1130553 | smartins | 2010-05-25 18:57:43 +0200 (Tue, 25 May 2010) | 2 lines
      
      Disable dropping in flatview
    ................
      r1130564 | winterz | 2010-05-25 19:21:11 +0200 (Tue, 25 May 2010) | 12 lines
      
      SVN_SILENT:
      Recorded merge of revisions 1130561 via svnmerge from 
      https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
      
      ........
        r1130561 | winterz | 2010-05-25 13:15:12 -0400 (Tue, 25 May 2010) | 4 lines
        
        possible fix for now showing the completeness percentage change for tasks.
        kolab/issue4360
        MERGE: trunk
      ........
    ................
      r1130598 | smartins | 2010-05-25 21:16:29 +0200 (Tue, 25 May 2010) | 2 lines
      
      Added method to return the Item associated with the given uid.
    ................
      r1130647 | smartins | 2010-05-25 23:37:11 +0200 (Tue, 25 May 2010) | 10 lines
      
      Fix bug were korg was creating incidences with duplicated uids.
      
      When dragging a todo from todoview to agendaview we should change the original todo's date/time instead of creating a new todo (4.4 behaviour) and
      only create a new one if it came from an external app.
      
      Fixes some crashes.
      
      BUG: 238050
    ................
      r1130664 | djarvie | 2010-05-26 01:04:56 +0200 (Wed, 26 May 2010) | 2 lines
      
      Call QApplication::beep() before KNotification::beep() in case of delays
    ................
      r1130667 | winterz | 2010-05-26 01:09:52 +0200 (Wed, 26 May 2010) | 9 lines
      
      merge forward SVN commit 1130661 by winterz:
      
      no longer dismiss active alarms when the user closes the dialog.
      force the user to specifically dismiss the reminders.
      
      so the closeEvent() does a save and closes the dialog thereby
      keeping all the active reminders...well "active".
      kolab/issue4203
    ................
      r1130668 | winterz | 2010-05-26 01:10:56 +0200 (Wed, 26 May 2010) | 17 lines
      
      SVN_SILENT:
      Recorded merge of revisions 1130661 via svnmerge from 
      https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
      
      ........
        r1130661 | winterz | 2010-05-25 18:57:31 -0400 (Tue, 25 May 2010) | 9 lines
        
        no longer dismiss active alarms when the user closes the dialog.
        force the user to specifically dismiss the reminders.
        
        so the closeEvent() does a save and closes the dialog thereby
        keeping all the active reminders...well "active".
        kolab/issue4203
        
        MERGE: trunk
      ........
    ................
      r1130746 | mlaurent | 2010-05-26 10:33:20 +0200 (Wed, 26 May 2010) | 2 lines
      
      fix working offline/online
    ................
      r1130755 | mlaurent | 2010-05-26 11:25:41 +0200 (Wed, 26 May 2010) | 2 lines
      
      In emailidentity we must migrate "Drafts"/"Templates"/"Fcc" too
    ................
      r1130765 | mlaurent | 2010-05-26 11:38:21 +0200 (Wed, 26 May 2010) | 2 lines
      
      We must migrate "startupFolder" too
    ................
      r1130769 | mlaurent | 2010-05-26 11:41:12 +0200 (Wed, 26 May 2010) | 2 lines
      
      Update status (for other migrate status I don't know)
    ................
      r1130788 | mlaurent | 2010-05-26 12:17:19 +0200 (Wed, 26 May 2010) | 2 lines
      
      Fix extract messages
    ................
      r1130803 | mlaurent | 2010-05-26 14:30:23 +0200 (Wed, 26 May 2010) | 2 lines
      
      Fix mem leak
    ................
      r1130819 | mlaurent | 2010-05-26 15:45:34 +0200 (Wed, 26 May 2010) | 2 lines
      
      Cleanup
    ................
      r1130868 | smartins | 2010-05-26 18:56:36 +0200 (Wed, 26 May 2010) | 2 lines
      
      Remove a todo comment. It's true.
    ................
      r1130883 | smartins | 2010-05-26 19:15:07 +0200 (Wed, 26 May 2010) | 9 lines
      
       //pending(AKONADI_PORT); review the newParent stuff down there
      
      Reviewed the newParent stuff "down there" and found a bug/typo.
      
      Fixes the nodes not changing parent when the incidence changed parent.
      
      
      CCBUG: 231354
    ................
      r1130906 | smartins | 2010-05-26 20:34:23 +0200 (Wed, 26 May 2010) | 4 lines
      
      Don't delete too much.
      
      BUG: 238059
    ................
      r1130926 | krake | 2010-05-26 21:36:03 +0200 (Wed, 26 May 2010) | 2 lines
      
      Change the top level collection name when the resource name has been set, e.g. by the migrator
    ................
      r1131008 | winterz | 2010-05-27 02:11:48 +0200 (Thu, 27 May 2010) | 2 lines
      
      fix semantic markup
    ................
      r1131009 | winterz | 2010-05-27 02:16:48 +0200 (Thu, 27 May 2010) | 4 lines
      
      load the libincidenceeditors catalog so we can get those translations
      replace libkresources catalog in favor of libakonadi (for standalone KOrganizer,
      this was already the case for the KOrg part)
    ................
      r1131082 | mlaurent | 2010-05-27 10:46:18 +0200 (Thu, 27 May 2010) | 2 lines
      
      Fix extract messages from all ui files
    ................
      r1131086 | mlaurent | 2010-05-27 11:08:53 +0200 (Thu, 27 May 2010) | 2 lines
      
      We want to select a folder not create a folder
    ................
      r1131100 | mlaurent | 2010-05-27 12:03:39 +0200 (Thu, 27 May 2010) | 2 lines
      
      Fix enable/disable folder properties
    ................
      r1131107 | mlaurent | 2010-05-27 12:38:41 +0200 (Thu, 27 May 2010) | 2 lines
      
      Word wrap text
    ................
      r1131117 | mlaurent | 2010-05-27 13:31:33 +0200 (Thu, 27 May 2010) | 4 lines
      
      "Clear text" is always supported
      => add it.
      Patch from Kevin
    ................
      r1131159 | mlaurent | 2010-05-27 16:21:53 +0200 (Thu, 27 May 2010) | 2 lines
      
      Remove duplicate code
    ................
      r1131160 | krake | 2010-05-27 16:22:09 +0200 (Thu, 27 May 2010) | 2 lines
      
      Also check for IMAP UIDs in mbox folders, normal KMail IMAP accounts use this for local caching
    ................
      r1131165 | krake | 2010-05-27 16:29:19 +0200 (Thu, 27 May 2010) | 2 lines
      
      The top level maildir has its mbox sub folders in its main directory, not in the subdir directory
    ................
      r1131166 | mlaurent | 2010-05-27 16:31:18 +0200 (Thu, 27 May 2010) | 4 lines
      
      Put offline agentinstance when we close kmail.
      I don't want that email is always download when I
      don't use kmail
    ................
      r1131168 | winterz | 2010-05-27 16:39:28 +0200 (Thu, 27 May 2010) | 17 lines
      
      SVN_SILENT:
      Blocked revisions 1131000-1131001 via svnmerge
      
      ........
        r1131000 | winterz | 2010-05-26 19:57:32 -0400 (Wed, 26 May 2010) | 5 lines
        
        fix a crash that can happen when formatting an invitation with a cancel
        request but the invitation is empty.
        BUG: 238945
        MERGE: trunk,4.4
      ........
        r1131001 | winterz | 2010-05-26 19:58:48 -0400 (Wed, 26 May 2010) | 3 lines
        
        revertlast
        wrong branch
      ........
    ................
      r1131170 | winterz | 2010-05-27 16:40:49 +0200 (Thu, 27 May 2010) | 14 lines
      
      SVN_SILENT:
      Recorded merge of revisions 1131006 via svnmerge from 
      https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
      
      ........
        r1131006 | winterz | 2010-05-26 20:05:54 -0400 (Wed, 26 May 2010) | 6 lines
        
        backport SVN commit 1131005 by winterz from trunk:
        
        fix a crash that can happen when formatting an invitation with a cancel
        request but the invitation is empty.
        MERGE: none
      ........
    ................
      r1131201 | krake | 2010-05-27 18:03:06 +0200 (Thu, 27 May 2010) | 2 lines
      
      When reading lines in a loop, also check if we reached the end of the device just to be sure
    ................
      r1131220 | mlaurent | 2010-05-27 19:22:22 +0200 (Thu, 27 May 2010) | 2 lines
      
      Comment this code
    ................
      r1131225 | krake | 2010-05-27 19:29:54 +0200 (Thu, 27 May 2010) | 3 lines
      
      Also migrate flags and tags for normal IMAP accounts using the same cache migrator.
      This currently also imports the cached headers, but why not
    ................
      r1131242 | tilladam | 2010-05-27 21:30:47 +0200 (Thu, 27 May 2010) | 1 line
      
      Whitespace cleanup.
    ................
      r1131243 | tilladam | 2010-05-27 21:35:22 +0200 (Thu, 27 May 2010) | 12 lines
      
      Fix porting bug to make Comparator actually compare correctly.
      
      This was crashing std::sort which apparenty for optimization reasons
      requires a < b to imply !(b < a). qSort, on the other hand, avoids the
      problem. The crash only showed up with sufficiently large keyrings, as
      apparently std::sort, likely again for optimization reasons, uses a
      simpler sort for shorter containers, which doesn't run into this issue.
      Fun bug, took Volker and me most of the train ride from Osnabrueck to
      Berlin to figure out why and how this happens, boring our travel
      companion to tears in the process. Geek out!
      
      BUG: 238708
    ................
      r1131282 | link | 2010-05-28 00:36:01 +0200 (Fri, 28 May 2010) | 8 lines
      
      the viewer/urlhandlermanager expects that the message (mMessage) it is
      passed is the root when doing index calculation  in urls. Simply passing
      the result of bodyAsMessage() does not cut it as the resulting pointer
      is a child in its tree. So, we copy the content tree making the
      encapsulated message the root node. props to thomas for figuring this
      out.
      
      BUG: 237174
    ................
      r1131283 | tmcguire | 2010-05-28 00:40:00 +0200 (Fri, 28 May 2010) | 5 lines
      
      Simplify
      
      This is a forward port of r1131280.
      
      I wonder though why we emit two signals here, that seems wrong to me.
    ................
      r1131284 | tmcguire | 2010-05-28 00:46:37 +0200 (Fri, 28 May 2010) | 10 lines
      
      SVN_SILENT:
      Recorded merge of revisions 1131280 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
      
      ........
        r1131280 | tmcguire | 2010-05-28 00:12:21 +0200 (Fri, 28 May 2010) | 2 lines
        
        Use the method we already have.
      ........
    ................
      r1131297 | link | 2010-05-28 02:47:20 +0200 (Fri, 28 May 2010) | 2 lines
      
      add a missing assemble after removing an attachment from the mime tree.
      BUG: 236727
    ................
      r1131299 | tmcguire | 2010-05-28 03:19:54 +0200 (Fri, 28 May 2010) | 1 line
      
      Remove unused method.
    ................
      r1131300 | tmcguire | 2010-05-28 03:19:56 +0200 (Fri, 28 May 2010) | 1 line
      
      Remove unused signal.
    ................
      r1131301 | tmcguire | 2010-05-28 03:19:58 +0200 (Fri, 28 May 2010) | 4 lines
      
      An attempt to simplify URL handling.
      
      The code path URL handling took was strange in places, should be simpler
      now.
    ................
      r1131302 | tmcguire | 2010-05-28 03:20:01 +0200 (Fri, 28 May 2010) | 3 lines
      
      Get rid of KMUrlClickedCommand.
      
      No reason why this is a command at all, so make it a utility function.
    ................
      r1131303 | tmcguire | 2010-05-28 03:20:03 +0200 (Fri, 28 May 2010) | 1 line
      
      Move stuff into its own URL handler for clearity.
    ................
      r1131304 | tmcguire | 2010-05-28 03:20:04 +0200 (Fri, 28 May 2010) | 1 line
      
      Add todo note.
    ................
      r1131305 | tmcguire | 2010-05-28 03:20:06 +0200 (Fri, 28 May 2010) | 1 line
      
      be less chatty
    ................
      r1131306 | tmcguire | 2010-05-28 03:20:08 +0200 (Fri, 28 May 2010) | 1 line
      
      Don't crash when encountring encapsulated message with empty subject
    ................
      r1131453 | mlaurent | 2010-05-28 09:41:27 +0200 (Fri, 28 May 2010) | 3 lines
      
      Disable 'put offline agent when we close kmail'
      But there is still pb that we download all the time email even if we close kmail
    ................
    
    svn path=/branches/work/komo/kdepim/; revision=1131500
    978b4953