wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_MERGE

Browse Source 
Merged revisions 1024154,1024156,1024160,1024269,1024283,1024289,1024298,1024355-1024357,1024359,1024362,1024375,1024382,1024410-1024411,1024414,1024425-1024426,1024428-1024430,1024486,1024571,1024579,1024583,1024592 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1024154 | vkrause | 2009-09-16 10:27:32 +0200 (Wed, 16 Sep 2009) | 3 lines
  
  Hm, apparently I forgot to commit those yesterday when moving the stuff
  from playground/pim.
................
  r1024156 | vkrause | 2009-09-16 10:38:36 +0200 (Wed, 16 Sep 2009) | 5 lines
  
  Show the class name of the current Nepomuk resource.
  
  It's always "Resource" here, while I would expect "PersonContact" or
  "Email", making it impossible to determine the type...
................
  r1024160 | tokoe | 2009-09-16 10:48:00 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  Replace hand crafted painting code with HTML based code
................
  r1024269 | scripty | 2009-09-16 11:55:45 +0200 (Wed, 16 Sep 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1024283 | tokoe | 2009-09-16 12:02:42 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  Replace hand crafted printing code with HTML based code
................
  r1024289 | nickschas | 2009-09-16 12:39:20 +0200 (Wed, 16 Sep 2009) | 1 line
  
  messagelist needs to link to KIO libs
................
  r1024298 | nickschas | 2009-09-16 12:49:40 +0200 (Wed, 16 Sep 2009) | 1 line
  
  Proper SOVERSIONing for libmessagelist
................
  r1024355 | tokoe | 2009-09-16 14:28:01 +0200 (Wed, 16 Sep 2009) | 5 lines
  
  Replaced hand crafted printing code with HTML based code.
  This fixes the layout issues that appeared after porting.
  
  BUG: 206323
................
  r1024356 | tokoe | 2009-09-16 14:35:04 +0200 (Wed, 16 Sep 2009) | 4 lines
  
  Add tooltip to color buttons
  
  BUG: 206328
................
  r1024357 | vkrause | 2009-09-16 14:38:20 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  Factor out the initial fetching code and make it fully async and a bit more clever.
................
  r1024359 | vkrause | 2009-09-16 14:42:18 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  SVN_SILENT remove unused stuff
................
  r1024362 | vkrause | 2009-09-16 14:55:14 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  Clean up shared pointer usage.
................
  r1024375 | tokoe | 2009-09-16 15:37:58 +0200 (Wed, 16 Sep 2009) | 4 lines
  
  Show an empty details view if no address book folder is selected.
  
  BUG: 205743
................
  r1024382 | vkrause | 2009-09-16 15:54:22 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  Convert categories to Nepomuk tags.
................
  r1024410 | tmcguire | 2009-09-16 17:09:42 +0200 (Wed, 16 Sep 2009) | 575 lines
  
  Block cyclic merges and other stuff.
  SVN_MERGE
  SVN_SILENT
  Blocked revisions 1021552,1021579,1021581,1021593-1021594,1021596-1021599,1021601-1021602,1021604-1021606,1021608,1021610,1021612-1021615,1021618,1021622,1021624-1021625,1021628,1021987,1022011,1022134,1022317,1022319,1022333,1022340,1022772,1023330,1023352 via svnmerge
  
  ................
    r1021552 | tmcguire | 2009-09-09 15:53:31 +0200 (Wed, 09 Sep 2009) | 1 line
    
    Compile
  ................
    r1021579 | tmcguire | 2009-09-09 16:59:14 +0200 (Wed, 09 Sep 2009) | 77 lines
    
    Block new message list, KAlarm, release stuff,scripty
    SVN_SILENT
    Blocked revisions 1016048,1016479,1017649,1019113,1019119,1019177,1019562,1019888,1019912,1020461,1020537,1020609,1020613 via svnmerge
    
    ........
      r1016048 | djarvie | 2009-08-26 23:26:10 +0200 (Wed, 26 Aug 2009) | 2 lines
      
      Add KDE 4.3.1 version number
    ........
      r1016479 | mkoller | 2009-08-27 23:39:26 +0200 (Thu, 27 Aug 2009) | 6 lines
      
      backport bug 180878
      
      CCBUG: 180878
      
      scroll to the selected message after clearing the quick search edit line
    ........
      r1017649 | djarvie | 2009-08-31 05:14:00 +0200 (Mon, 31 Aug 2009) | 2 lines
      
      Use KDE system settings to determine default working days in the week.
    ........
      r1019113 | mkoller | 2009-09-02 23:45:13 +0200 (Wed, 02 Sep 2009) | 6 lines
      
      
      Backport r1019109 by mkoller from trunk to the 4.3 branch:
      
      Use KDE's locale/calendar settings for the Group Header in aggregations
    ........
      r1019119 | winterz | 2009-09-03 00:02:42 +0200 (Thu, 03 Sep 2009) | 7 lines
      
      Backport r1019115 by winterz from trunk to the 4.3 branch:
      
      probable crash fix when autocompleting LDAP address.
      CCBUG: 206024
      MERGE: e35,e4,4.3
    ........
      r1019177 | scripty | 2009-09-03 06:11:28 +0200 (Thu, 03 Sep 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ........
      r1019562 | lueck | 2009-09-03 23:37:42 +0200 (Thu, 03 Sep 2009) | 1 line
      
      revert as requested by David Jarvie
    ........
      r1019888 | lueck | 2009-09-04 20:19:50 +0200 (Fri, 04 Sep 2009) | 1 line
      
      add to backport for kdepim
    ........
      r1019912 | lueck | 2009-09-04 21:20:45 +0200 (Fri, 04 Sep 2009) | 2 lines
      
      fix doc update, the stuff about Shift-Delete deleting withouta confirmation prompt is already commited. Thanks to David Jarvie for keeping an eye on me
      CCMAIL:djarvie@kde.org
    ........
      r1020461 | mkoller | 2009-09-06 13:33:42 +0200 (Sun, 06 Sep 2009) | 5 lines
      
      backport of 1016754 by mkoller for bug 181794
      
      if the aggregation is defined without grouping only show the root decoration when
      threading is enabled
    ........
      r1020537 | tmcguire | 2009-09-06 16:48:07 +0200 (Sun, 06 Sep 2009) | 1 line
      
      version++
    ........
      r1020609 | mkoller | 2009-09-06 20:30:01 +0200 (Sun, 06 Sep 2009) | 7 lines
      
      Backport r1020607 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 95665
      
      store the "dont ask again" flag in the global config, so that kontact/kmail share it
    ........
      r1020613 | mkoller | 2009-09-06 20:43:32 +0200 (Sun, 06 Sep 2009) | 2 lines
      
      Revert last change to not have update problems with config settings
    ........
  ................
    r1021581 | tmcguire | 2009-09-09 17:07:15 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    SVN_SILENT not needed here
    
    Blocked revisions 1016057 via svnmerge
    
    ........
      r1016057 | mkoller | 2009-08-26 23:50:18 +0200 (Wed, 26 Aug 2009) | 6 lines
      
      
      Backport r1016056 by mkoller from trunk to the 4.3 branch:
      
      make sure we have spacing between buttons
    ........
  ................
    r1021593 | tmcguire | 2009-09-09 18:10:27 +0200 (Wed, 09 Sep 2009) | 34 lines
    
    Block, affects new message list/new folder list code
    SVN_SILENT
    Blocked revisions 1016436,1016458 via svnmerge
    
    ........
      r1016436 | mkoller | 2009-08-27 22:03:12 +0200 (Thu, 27 Aug 2009) | 19 lines
      
      Backport r1016433 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 205253
      
      Fix inconsistent selection behavior in "Find Messages" window:
      - Selecting a mail updates the message preview (if there is one) and
        does not open a new window for the selected mail
      - Double clicking and the button "open message" opens the mail in a new window
      
      This also fixes the problems:
      - double clicking no longer opens three mail reader windows when no message preview
        is shown
      - changing the shown message in the message preview no longer flickers
        due to now checking if the folder containing the selected mail is already shown,
        which also fixes the problem that when you clicked a currently shown folder the second time
        on the folder tree, the current message shown was cleared.
    ........
      r1016458 | mkoller | 2009-08-27 22:41:27 +0200 (Thu, 27 Aug 2009) | 8 lines
      
      Backport r1016457 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 186162
      
      when selecting a mail in the "Find Messages" window, correctly update
      the selection in the message list.
    ........
  ................
    r1021594 | tmcguire | 2009-09-09 18:12:48 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1017920 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1017920 | mkoller | 2009-08-31 23:43:59 +0200 (Mon, 31 Aug 2009) | 7 lines
      
      Backport r1017919 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 205448
      
      find a better compromise between search speed and responseness of the ui (empirical result)
    ........
  ................
    r1021596 | tmcguire | 2009-09-09 18:15:49 +0200 (Wed, 09 Sep 2009) | 17 lines
    
    Merged revisions 1019073 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1019073 | winterz | 2009-09-02 21:14:28 +0200 (Wed, 02 Sep 2009) | 11 lines
      
      Backport r1019064 by winterz from trunk to the 4.3 branch:
      
      show UTC incidences in the local time zone, which is especially useful
      for Kolab users who see all their incidences in UTC.
      
      Based on a patch from Steffen Hanikel. Thanks!
      
      CCBUG: 204059
      MERGE: e35,e4,4.3
    ........
  ................
    r1021597 | tmcguire | 2009-09-09 18:18:26 +0200 (Wed, 09 Sep 2009) | 11 lines
    
    SVN_SILENT cyclic merge
    Blocked revisions 1019358 via svnmerge
    
    ........
      r1019358 | winterz | 2009-09-03 13:40:30 +0200 (Thu, 03 Sep 2009) | 4 lines
      
      Backport r1017761 by thiago from trunk to the 4.3 branch:
      
      Don't crash if currentItem is 0
    ........
  ................
    r1021598 | tmcguire | 2009-09-09 18:22:19 +0200 (Wed, 09 Sep 2009) | 9 lines
    
    Merged revisions 1019521 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1019521 | lueck | 2009-09-03 21:42:47 +0200 (Thu, 03 Sep 2009) | 1 line
      
      missed pim doc backport for 4.3
    ........
  ................
    r1021599 | tmcguire | 2009-09-09 18:24:05 +0200 (Wed, 09 Sep 2009) | 9 lines
    
    SVN_SILENT
    Blocked revisions 1019504 via svnmerge
    
    ........
      r1019504 | lueck | 2009-09-03 20:53:01 +0200 (Thu, 03 Sep 2009) | 1 line
      
      pim doc backport for 4.3
    ........
  ................
    r1021601 | tmcguire | 2009-09-09 18:29:01 +0200 (Wed, 09 Sep 2009) | 11 lines
    
    Merged revisions 1019990 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1019990 | mkoller | 2009-09-05 01:27:15 +0200 (Sat, 05 Sep 2009) | 5 lines
      
      Backport bug 191455
      
      Replace dir-delimiters with _ char onm saving attachments
    ........
  ................
    r1021602 | tmcguire | 2009-09-09 18:31:36 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1020117 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020117 | winterz | 2009-09-05 12:30:35 +0200 (Sat, 05 Sep 2009) | 7 lines
      
      Backport r1020115 by winterz from trunk to the 4.3 branch:
      
      crash guard
      CCBUG: 206306
      MERGE: 4.3
    ........
  ................
    r1021604 | tmcguire | 2009-09-09 18:34:35 +0200 (Wed, 09 Sep 2009) | 12 lines
    
    Merged revisions 1020261 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020261 | mkoller | 2009-09-05 23:30:19 +0200 (Sat, 05 Sep 2009) | 6 lines
      
      backport of bugfix for #196053
      Fix crash in precommand execution (hopefully).
      The crash was probably due to the eventloop object got destroyed in its own loop.
      catch 0-pointer instead of assert. Happens when kmail exits while precommand runs
    ........
  ................
    r1021605 | tmcguire | 2009-09-09 18:38:21 +0200 (Wed, 09 Sep 2009) | 12 lines
    
    Merged revisions 1020455 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020455 | mkoller | 2009-09-06 13:24:52 +0200 (Sun, 06 Sep 2009) | 6 lines
      
      backport of 1017452 by mkoller of bug 160990
      
      When scrolling one page, use 80% of the available height of the current
      view (not the height of the complete widget including the message structure viewer)
    ........
  ................
    r1021606 | tmcguire | 2009-09-09 18:41:43 +0200 (Wed, 09 Sep 2009) | 11 lines
    
    Merged revisions 1020457 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020457 | mkoller | 2009-09-06 13:26:54 +0200 (Sun, 06 Sep 2009) | 5 lines
      
      Backport r1017140 by mkoller from trunk to the 4.3 branch:
      
      remove accelerator marker when selecting one of many mail addresses on dropping a vcard
    ........
  ................
    r1021608 | tmcguire | 2009-09-09 18:44:13 +0200 (Wed, 09 Sep 2009) | 11 lines
    
    Merged revisions 1020458 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020458 | mkoller | 2009-09-06 13:28:18 +0200 (Sun, 06 Sep 2009) | 5 lines
      
      Backport r1016921 by mkoller from trunk to the 4.3 branch:
      
      When compressing an attachment, mark the mail as modified.
    ........
  ................
    r1021610 | tmcguire | 2009-09-09 18:46:28 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1020460 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020460 | mkoller | 2009-09-06 13:30:30 +0200 (Sun, 06 Sep 2009) | 7 lines
      
      Backport r1016778 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 204532
      
      Show clear button in text input field
    ........
  ................
    r1021612 | tmcguire | 2009-09-09 18:48:18 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1020464 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020464 | mkoller | 2009-09-06 13:39:18 +0200 (Sun, 06 Sep 2009) | 7 lines
      
      Backport r1016744 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 205018
      
      obey the current icons size when setting the column width for the first three columns
    ........
  ................
    r1021613 | tmcguire | 2009-09-09 18:49:40 +0200 (Wed, 09 Sep 2009) | 14 lines
    
    Merged revisions 1020465 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020465 | mkoller | 2009-09-06 13:40:09 +0200 (Sun, 06 Sep 2009) | 8 lines
      
      Backport r1017340 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 140353
      
      try to find the annoyance-filter executable in the default installation
      path but also in a system path
    ........
  ................
    r1021614 | tmcguire | 2009-09-09 18:52:47 +0200 (Wed, 09 Sep 2009) | 16 lines
    
    SVN_SILENT
    Recorded merge of revisions 1020525 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020525 | tmcguire | 2009-09-06 16:13:50 +0200 (Sun, 06 Sep 2009) | 8 lines
      
      Backport r1014138 by tmcguire from trunk to the 4.3 branch:
      
      Fix the problem that the forward menu was empty, because the action list was
      plugged before createGUI() was called.
      Also, clean up a bit, for example don't set the shortcuts twice.
      
      BUG: 206377
    ........
  ................
    r1021615 | tmcguire | 2009-09-09 18:55:16 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1020526 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020526 | tmcguire | 2009-09-06 16:15:27 +0200 (Sun, 06 Sep 2009) | 7 lines
      
      Backport r1020484 by tmcguire from trunk to the 4.3 branch:
      
      Don't crash when importing two messages and the first import failed, because then
      the folder was not created yet, and KMail tried to add the message to a non-existant
      folder.
    ........
  ................
    r1021618 | tmcguire | 2009-09-09 18:59:20 +0200 (Wed, 09 Sep 2009) | 11 lines
    
    Merged revisions 1020527 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020527 | tmcguire | 2009-09-06 16:16:24 +0200 (Sun, 06 Sep 2009) | 4 lines
      
      Backport r1020504 by tmcguire from trunk to the 4.3 branch:
      
      Argh, code duplication! Fix the import crash here as well.
    ........
  ................
    r1021622 | tmcguire | 2009-09-09 19:02:35 +0200 (Wed, 09 Sep 2009) | 11 lines
    
    Merged revisions 1020587 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020587 | mkoller | 2009-09-06 19:20:48 +0200 (Sun, 06 Sep 2009) | 5 lines
      
      backport of r1020581 for bug 143237
      
      Check for an attachment not only in the first BodyPart but in the Message itself if it has no first BodyPart.
    ........
  ................
    r1021624 | tmcguire | 2009-09-09 19:08:12 +0200 (Wed, 09 Sep 2009) | 16 lines
    
    Merged revisions 1020593 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020593 | mkoller | 2009-09-06 19:33:17 +0200 (Sun, 06 Sep 2009) | 10 lines
      
      Backport r1020592 by mkoller from trunk to the 4.3 branch:
      
      CCBUG: 185167
      
      make sure the "save as" dialog does not strip the filename part after the last "."
      thinking it's an extension.
      
      Also, factor out a fileName cleaning function
    ........
  ................
    r1021625 | tmcguire | 2009-09-09 19:10:01 +0200 (Wed, 09 Sep 2009) | 12 lines
    
    SVN_SILENT
    Blocked revisions 1020612 via svnmerge
    
    ........
      r1020612 | mkoller | 2009-09-06 20:38:09 +0200 (Sun, 06 Sep 2009) | 6 lines
      
      Backport r1020610 by mkoller from trunk to the 4.3 branch:
      
      store the "dont ask again" flag in the global config, so that kontact/kmail
      share it
    ........
  ................
    r1021628 | tmcguire | 2009-09-09 19:14:53 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1020871 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepim
    
    ........
      r1020871 | winterz | 2009-09-07 14:25:25 +0200 (Mon, 07 Sep 2009) | 7 lines
      
      Backport r1020870 by winterz from trunk to the 4.3 branch:
      
      crash guard
      CCBUG: 206625
      MERGE: 4.3
    ........
  ................
    r1021987 | winterz | 2009-09-10 15:18:46 +0200 (Thu, 10 Sep 2009) | 11 lines
    
    Blocked revisions 1021984 via svnmerge
    
    ........
      r1021984 | winterz | 2009-09-10 09:11:26 -0400 (Thu, 10 Sep 2009) | 5 lines
      
      add a crash guard in selectedVisibleSernums() to solve
      kolab/issue3853
      
      MERGE: none (already in e4 and trunk)
    ........
  ................
    r1022011 | winterz | 2009-09-10 16:47:20 +0200 (Thu, 10 Sep 2009) | 26 lines
    
    Blocked revisions 1021490 via svnmerge
    
    ................
      r1021490 | tmcguire | 2009-09-09 06:43:07 -0400 (Wed, 09 Sep 2009) | 21 lines
      
      Merge for kolab/issue3831
      Do not merge into the tag, string changes.
      --
      Crossport r986306 by tmcguire from trunk to the enterprise35 branch:
      
      Merged revisions 966821 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
      
      ........
        r966821 | tmcguire | 2009-05-12 00:35:10 +0200 (Tue, 12 May 2009) | 8 lines
        
        When inline forwarding a message, include the CCs as well by default.
        For this, a new template command OADDRESSEESADDR was added.
        
        Thanks to David "Usability" Faure for suggesting this.
        
        Note to self: When porting to trunk, use "templates.diff" in your KMail dir,
                      to avoid conflicts.
      ........
    ................
  ................
    r1022134 | winterz | 2009-09-10 23:23:32 +0200 (Thu, 10 Sep 2009) | 8 lines
    
    Blocked revisions 1022131 via svnmerge
    
    ........
      r1022131 | winterz | 2009-09-10 17:21:39 -0400 (Thu, 10 Sep 2009) | 2 lines
      
      fix include guard
    ........
  ................
    r1022317 | tmcguire | 2009-09-11 15:00:29 +0200 (Fri, 11 Sep 2009) | 1 line
    
    Update Newslog.txt
  ................
    r1022319 | tmcguire | 2009-09-11 15:01:49 +0200 (Fri, 11 Sep 2009) | 1 line
    
    SVN_SILENT Update version numbers for today's release.
  ................
    r1022333 | winterz | 2009-09-11 15:23:36 +0200 (Fri, 11 Sep 2009) | 16 lines
    
    Blocked revisions 1022309,1022312,1022318 via svnmerge
    
    ........
      r1022309 | tmcguire | 2009-09-11 08:47:13 -0400 (Fri, 11 Sep 2009) | 1 line
      
      Update Newslog.txt
    ........
      r1022312 | tmcguire | 2009-09-11 08:51:34 -0400 (Fri, 11 Sep 2009) | 1 line
      
      SVN_SILENT add another issue, which was not in the commit message but is fixed.
    ........
      r1022318 | tmcguire | 2009-09-11 09:01:47 -0400 (Fri, 11 Sep 2009) | 1 line
      
      SVN_SILENT Update version numbers for today's release.
    ........
  ................
    r1022340 | winterz | 2009-09-11 16:15:29 +0200 (Fri, 11 Sep 2009) | 10 lines
    
    Recorded merge of revisions 1022242 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022242 | mutz | 2009-09-11 05:23:05 -0400 (Fri, 11 Sep 2009) | 2 lines
      
      Always evaluate decryptionStarted (like elsewhere we call okDecryptMIME), not only when okDecryptMIME returns true.
      Fixes kolab/issue3855 ([regression] S/MIME opaque signed and encrypted email suboptimal display)
    ........
  ................
    r1022772 | winterz | 2009-09-12 15:48:22 +0200 (Sat, 12 Sep 2009) | 15 lines
    
    Merged revisions 1022769 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022769 | winterz | 2009-09-12 09:42:17 -0400 (Sat, 12 Sep 2009) | 9 lines
      
      backport SVN commit 1022768 by winterz from trunk to e35:
      
      In isMyKolabIncidence(), search through all the calendars in the resource manager
      for the incidence's Resource. This is a more general purpose solution than using
      CalendarResources::resource()
      
      MERGE: e4
    ........
  ................
    r1023330 | winterz | 2009-09-14 16:33:06 +0200 (Mon, 14 Sep 2009) | 12 lines
    
    Merged revisions 1023323 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1023323 | winterz | 2009-09-14 10:21:44 -0400 (Mon, 14 Sep 2009) | 5 lines
      
      backport SVN commit 1023092 by winterz from trunk to e35:
      
      lots of little fixups in the displayview found when working on kolab/issue 3813
      MERGE: e4
    ........
  ................
    r1023352 | winterz | 2009-09-14 17:45:01 +0200 (Mon, 14 Sep 2009) | 9 lines
    
    Blocked revisions 1023350 via svnmerge
    
    ........
      r1023350 | winterz | 2009-09-14 11:43:41 -0400 (Mon, 14 Sep 2009) | 3 lines
      
      minor cleanup
      MERGE: none
    ........
  ................
................
  r1024411 | tmcguire | 2009-09-16 17:12:40 +0200 (Wed, 16 Sep 2009) | 74 lines
  
  Found even more stuff to block (empty commits + 1 recording)
  SVN_MERGE
  SVN_SILENT
  Blocked revisions 1022133,1022368,1022506,1023351,1023455 via svnmerge
  
  ................
    r1022133 | winterz | 2009-09-10 23:22:21 +0200 (Thu, 10 Sep 2009) | 11 lines
    
    Merged revisions 1022128 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022128 | winterz | 2009-09-10 17:15:03 -0400 (Thu, 10 Sep 2009) | 4 lines
      
      A collection of static methods providing Calendar helpers.
      TODO: unit tests
      MERGE: e4, trunk
    ........
  ................
    r1022368 | winterz | 2009-09-11 18:06:21 +0200 (Fri, 11 Sep 2009) | 10 lines
    
    Merged revisions 1022363 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022363 | winterz | 2009-09-11 12:01:43 -0400 (Fri, 11 Sep 2009) | 3 lines
      
      fix the crash guard in resourceString().
      MERGE: e4,trunk,4.3
    ........
  ................
    r1022506 | winterz | 2009-09-11 23:43:34 +0200 (Fri, 11 Sep 2009) | 13 lines
    
    Recorded merge of revisions 1022470 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022470 | winterz | 2009-09-11 16:37:34 -0400 (Fri, 11 Sep 2009) | 7 lines
      
      port to non-deprected versions of IncidenceFormatter::toolTipString()
      and IncidenceFormatter::extensiveDisplayString()
      
      MERGE: e4,trunk
      DO_NOT_BACKPORT: 4.3
    ........
  ................
    r1023351 | winterz | 2009-09-14 17:44:06 +0200 (Mon, 14 Sep 2009) | 11 lines
    
    Merged revisions 1023347 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1023347 | winterz | 2009-09-14 11:25:46 -0400 (Mon, 14 Sep 2009) | 4 lines
      
      fix printing inviation durations if the duration is more than 24 hrs
      kolab/issue3864
      MERGE: e4,trunk,4.3
    ........
  ................
    r1023455 | winterz | 2009-09-14 21:11:07 +0200 (Mon, 14 Sep 2009) | 12 lines
    
    Merged revisions 1023445 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1023445 | winterz | 2009-09-14 14:58:14 -0400 (Mon, 14 Sep 2009) | 5 lines
      
      when printing month view, only print events on the days specified by the range.
      kolab/issue3683
      
      MERGE: e4,trunk,4.3
    ........
  ................
................
  r1024414 | tmcguire | 2009-09-16 17:19:31 +0200 (Wed, 16 Sep 2009) | 29 lines
  
  Not relevant, kmheaders change
  SVN_MERGE
  SVN_SILENT
  Blocked revisions 1021339 via svnmerge
  
  ................
    r1021339 | winterz | 2009-09-09 00:59:00 +0200 (Wed, 09 Sep 2009) | 20 lines
    
    Merged revisions 1021337 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021337 | winterz | 2009-09-08 18:55:26 -0400 (Tue, 08 Sep 2009) | 14 lines
      
      add a crash guard in selectedSernums() that seems to help fix 
      the following part of kolab/issue3833
      
      1. Create imap folder
      2. Copy some mails in it
      3. Sync
      4. Create fav.
      5. Rename folder
      6. Sync
      8. Click on a mail
      
      MERGE: e4 (relevant code has been completely rewritten in trunk)
    ........
  ................
................
  r1024425 | tmcguire | 2009-09-16 17:42:16 +0200 (Wed, 16 Sep 2009) | 21 lines
  
  SVN_MERGE
  Merged revisions 1021557 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1021557 | winterz | 2009-09-09 16:07:16 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1021405 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021405 | mutz | 2009-09-09 02:10:05 -0400 (Wed, 09 Sep 2009) | 5 lines
      
      certmanager/lib/ui/messagebox.cpp: make saved auditlog valid HTML
      
      Before, we were writing out the QtML that we have in the QTextEdit. Now, we
      keep a pristine copy of the audit log as received from the backend, and wrap
      it in <html><head><title>{caption}</title></head><body>...</body></html>
    ........
  ................
................
  r1024426 | tmcguire | 2009-09-16 17:44:18 +0200 (Wed, 16 Sep 2009) | 21 lines
  
  SVN_MERGE
  Merged revisions 1021558 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1021558 | winterz | 2009-09-09 16:14:02 +0200 (Wed, 09 Sep 2009) | 13 lines
    
    Merged revisions 1021421 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021421 | mutz | 2009-09-09 02:38:07 -0400 (Wed, 09 Sep 2009) | 5 lines
      
      QGpgMEJob: fix reads past-the-end in get_auditlog_as_html
      
      In Qt3, QByteArrays are not '\0'-delimited, so we need to pass the QByteArray
      size explicitly into QString::fromUtf8(). This removes the garbage at the end
      of the audit log.
    ........
  ................
................
  r1024428 | tmcguire | 2009-09-16 17:50:50 +0200 (Wed, 16 Sep 2009) | 17 lines
  
  SVN_MERGE
  Merged revisions 1022013 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1022013 | winterz | 2009-09-10 16:50:12 +0200 (Thu, 10 Sep 2009) | 9 lines
    
    Merged revisions 1021492 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1021492 | tmcguire | 2009-09-09 06:48:29 -0400 (Wed, 09 Sep 2009) | 2 lines
      
      Add the time to the template, for kolab/issue3833.
    ........
  ................
................
  r1024429 | tmcguire | 2009-09-16 17:52:28 +0200 (Wed, 16 Sep 2009) | 17 lines
  
  SVN_MERGE
  Merged revisions 1022284 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1022284 | winterz | 2009-09-11 13:19:22 +0200 (Fri, 11 Sep 2009) | 9 lines
    
    Merged revisions 1022235 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022235 | mutz | 2009-09-11 04:40:28 -0400 (Fri, 11 Sep 2009) | 1 line
      
      Don't leave a signTestNode lying around if we've already written out a deferred decryption block. Fixes regression kolab/issue3577.
    ........
  ................
................
  r1024430 | tmcguire | 2009-09-16 17:55:21 +0200 (Wed, 16 Sep 2009) | 22 lines
  
  SVN_MERGE
  Merged revisions 1022339 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1022339 | winterz | 2009-09-11 16:09:11 +0200 (Fri, 11 Sep 2009) | 14 lines
    
    Merged revisions 1022241 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1022241 | mutz | 2009-09-11 05:18:24 -0400 (Fri, 11 Sep 2009) | 7 lines
      
      Behaviour-preserving change in preparation of the fix for kolab/issue3855:
      
      if ( C1 ) { E1 } else if ( C2 ) { E2 } else { E3 }
                                        ||
                                        VV
      if ( C1 ) { E1 } else { const bool b2 = C2; if ( b2 ) { E2 } else { E3 } }
    ........
  ................
................
  r1024486 | tmcguire | 2009-09-16 19:06:03 +0200 (Wed, 16 Sep 2009) | 1 line
  
  lie--
................
  r1024571 | mlaurent | 2009-09-16 22:49:38 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  not necessary
................
  r1024579 | mlaurent | 2009-09-16 23:23:54 +0200 (Wed, 16 Sep 2009) | 2 lines
  
  Port to KNotificationItem
................
  r1024583 | winterz | 2009-09-16 23:30:56 +0200 (Wed, 16 Sep 2009) | 3 lines
  
  port to using the new kdepimlibs/kontactinterface library.
................
  r1024592 | gamaral | 2009-09-16 23:46:02 +0200 (Wed, 16 Sep 2009) | 3 lines
  
  - Get Akonadi resoure "Notes" working.
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1024683
wilder-work
Volker Krause 17 years ago
parent 828141c997
commit d3c3932128
2 changed files with 37 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      objecttreeparser.cpp
  2. 13
      templatesconfiguration.cpp

56
objecttreeparser.cpp
Unescape View File

@ -1781,7 +1781,9 @@ namespace KMail {
if ( mReader && !mReader->decryptMessage() ) {
writeDeferredDecryptionBlock();
isEncrypted = true;
} else if ( okDecryptMIME( *node,
signTestNode = 0; // PENDING(marc) to be abs. sure, we'd need to have to look at the content
} else {
const bool bOkDecrypt = okDecryptMIME( *node,
decryptedData,
signatureFound,
signatures,
@ -1791,14 +1793,16 @@ namespace KMail {
decryptionStarted,
messagePart.errorText,
messagePart.auditLogError,
messagePart.auditLog ) ) {
kDebug() << "pkcs7 mime - encryption found - enveloped (encrypted) data !";
isEncrypted = true;
node->setEncryptionState( KMMsgFullyEncrypted );
signTestNode = 0;
messagePart.auditLog );
if ( decryptionStarted ) {
writeDecryptionInProgressBlock();
} else {
return true;
}
if ( bOkDecrypt ) {
kDebug() << "pkcs7 mime - encryption found - enveloped (encrypted) data !";
isEncrypted = true;
node->setEncryptionState( KMMsgFullyEncrypted );
signTestNode = 0;
// paint the frame
messagePart.isDecryptable = true;
if ( mReader )
@ -1810,31 +1814,31 @@ namespace KMail {
"encrypted data" );
if ( mReader )
htmlWriter()->queue( writeSigstatFooter( messagePart ) );
}
} else {
} else {
// decryption failed, which could be because the part was encrypted but
// decryption failed, or because we didn't know if it was encrypted, tried,
// and failed. If the message was not actually encrypted, we continue
// assuming it's signed
if ( passphraseError || ( smimeType.isEmpty() && actuallyEncrypted ) ) {
isEncrypted = true;
signTestNode = 0;
}
if ( passphraseError || ( smimeType.isEmpty() && actuallyEncrypted ) ) {
isEncrypted = true;
signTestNode = 0;
}
if ( isEncrypted ) {
kDebug() << "pkcs7 mime - ERROR: COULD NOT DECRYPT enveloped data !";
// paint the frame
messagePart.isDecryptable = false;
if ( mReader ) {
htmlWriter()->queue( writeSigstatHeader( messagePart,
cryptoProtocol(),
node->trueFromAddress() ) );
assert( mReader->decryptMessage() ); // handled above
writePartIcon( &node->msgPart(), node->nodeId() );
htmlWriter()->queue( writeSigstatFooter( messagePart ) );
if ( isEncrypted ) {
kDebug() << "pkcs7 mime - ERROR: COULD NOT DECRYPT enveloped data !";
// paint the frame
messagePart.isDecryptable = false;
if ( mReader ) {
htmlWriter()->queue( writeSigstatHeader( messagePart,
cryptoProtocol(),
node->trueFromAddress() ) );
assert( mReader->decryptMessage() ); // handled above
writePartIcon( &node->msgPart(), node->nodeId() );
htmlWriter()->queue( writeSigstatFooter( messagePart ) );
}
} else {
kDebug() << "pkcs7 mime - NO encryption found";
}
} else {
kDebug() << "pkcs7 mime - NO encryption found";
}
}
if ( isEncrypted )

13
templatesconfiguration.cpp
Unescape View File

@ -353,19 +353,20 @@ QString TemplatesConfiguration::defaultForward()
"%REM=\"" + i18n( "Default forward template" ) + "\"%-\n" +
i18nc( "Default forward template: %1: subject of original message, "
"%2: date of original message, "
"%3: mail address of original sender, "
"%4: original message text",
"%3: time of original message, "
"%4: mail address of original sender, "
"%5: original message text",
"\n"
"---------- Forwarded Message ----------\n"
"\n"
"Subject: %1\n"
"Date: %2\n"
"From: %3\n"
"Date: %2, %3\n"
"From: %4\n"
"%OADDRESSEESADDR\n"
"\n"
"%4\n"
"%5\n"
"-----------------------------------------",
"%OFULLSUBJECT", "%ODATE", "%OFROMADDR", "%TEXT" );
"%OFULLSUBJECT", "%ODATE", "%OTIMELONG", "%OFROMADDR", "%TEXT" );
}
QString TemplatesConfiguration::defaultQuoteString() {

Write Preview
Loading…
Cancel
Save