r1071290 | tmcguire | 2010-01-07 21:17:42 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058208 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058208 | mutz | 2009-12-04 10:08:59 +0100 (Fri, 04 Dec 2009) | 1 line
  
  SignEMailTask: assert that none of the signer keys is null
........

r1071291 | tmcguire | 2010-01-07 21:20:23 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058486 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058486 | mutz | 2009-12-04 15:50:52 +0100 (Fri, 04 Dec 2009) | 1 line
  
  ++comments, debug
........

r1071296 | tmcguire | 2010-01-07 21:26:35 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1058488 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058488 | mutz | 2009-12-04 15:54:20 +0100 (Fri, 04 Dec 2009) | 1 line
  
  kleo_assert.h: add kleo_assert_fail(), for when you already know kleo_assert() would fail.
........
SVN_MERGE

r1071297 | tmcguire | 2010-01-07 21:27:07 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1058493 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058493 | mutz | 2009-12-04 16:04:26 +0100 (Fri, 04 Dec 2009) | 1 line
  
  stl_util.h: Even more algorithms...
........
SVN_MERGE

r1071298 | tmcguire | 2010-01-07 21:27:47 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1058494 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058494 | mutz | 2009-12-04 16:08:28 +0100 (Fri, 04 Dec 2009) | 1 line
  
  stl_util.h: remove redundant contains() overload, add one for find_if(), who needs it for the setting in rev.1041806
........
SVN_MERGE

r1071299 | tmcguire | 2010-01-07 21:28:27 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1058502 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058502 | mutz | 2009-12-04 16:14:35 +0100 (Fri, 04 Dec 2009) | 1 line
  
  Cached: small class template that equips a T with a dirty flag
........
SVN_MERGE

r1071301 | tmcguire | 2010-01-07 21:29:02 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1058507 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058507 | mutz | 2009-12-04 16:21:00 +0100 (Fri, 04 Dec 2009) | 1 line
  
  KeyCache: add methods find{Encryption,Signing}KeysByMailbox()
........
SVN_MERGE

r1071303 | tmcguire | 2010-01-07 21:31:36 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058509 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058509 | mutz | 2009-12-04 16:22:56 +0100 (Fri, 04 Dec 2009) | 1 line
  
  Sender/Recipient: new classes wrapping a sender/recipient mailbox and associated keys
........

r1071305 | tmcguire | 2010-01-07 21:33:01 +0100 (Thu, 07 Jan 2010) | 14 lines

SVN_MERGE
Merged revisions 1058515 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058515 | mutz | 2009-12-04 16:30:43 +0100 (Fri, 04 Dec 2009) | 5 lines
  
  SignEncryptEMailConflictDialog: new, combined, sign/encrypt dialog
  
  It's supposed to be popped up only when there's an ambiguity
  of certificates for at least one recipient/sender, or if no
  certificates are found.
........

r1071306 | tmcguire | 2010-01-07 21:34:09 +0100 (Thu, 07 Jan 2010) | 20 lines

SVN_MERGE
Merged revisions 1058519 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058519 | mutz | 2009-12-04 16:41:10 +0100 (Fri, 04 Dec 2009) | 11 lines
  
  Some smartcard monitoring fixes (which don't fix the real problem, though):
  
  - Delay spawning of the smartcard monitoring thread until after keylisting,
    to prevent starting up too many gpg-agents at startup on Windows. They
    go on to cannibalize each other, so:
  - Re-connect when we get an ASS_GENERAL or similar errors from assuan_transact
    (which happens when we were connected to one of the victims of the canibal
    tribe above).
  
  Unfortunately, all these really good fixes still don't make smartcard support
  work on Windows...
........

r1071307 | tmcguire | 2010-01-07 21:35:38 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058529 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058529 | mutz | 2009-12-04 17:12:53 +0100 (Fri, 04 Dec 2009) | 1 line
  
  NewSignEncryptEMailController: start of a combined sign/encrypt email controller
........

r1071308 | tmcguire | 2010-01-07 21:37:02 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058530 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058530 | mutz | 2009-12-04 17:14:07 +0100 (Fri, 04 Dec 2009) | 1 line
  
  PREP_ENCRYPT, SIGN, ENCRYPT: use NewSignEncryptEMailController
........

r1071310 | tmcguire | 2010-01-07 21:42:23 +0100 (Thu, 07 Jan 2010) | 13 lines

Note: This merge was done by copying the UI file because of conflicts.
SVN_MERGE
Merged revisions 1058590 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058590 | mutz | 2009-12-04 20:02:50 +0100 (Fri, 04 Dec 2009) | 3 lines
  
  NewCertificateWizard: allow the admin to set the allowed key sizes and types.
  
  TODO: more tests, deal with key type being set to immutable in KConfig
........

r1071313 | tmcguire | 2010-01-07 21:47:49 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058662 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058662 | mutz | 2009-12-04 22:58:40 +0100 (Fri, 04 Dec 2009) | 1 line
  
  Compile with boost 1.33.1 (aka stone-age)
........

r1071314 | tmcguire | 2010-01-07 21:50:09 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058664 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058664 | mutz | 2009-12-04 23:02:04 +0100 (Fri, 04 Dec 2009) | 1 line
  
  Compile with boost 1.33.1 (aka stone-age)
........

r1071315 | tmcguire | 2010-01-07 21:51:43 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1058669 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1058669 | mutz | 2009-12-04 23:08:57 +0100 (Fri, 04 Dec 2009) | 1 line
  
  Don't clash with boost::is_empty<> (in Boost 1.33.1, or when including Boost.Lambda)
........

r1071319 | tmcguire | 2010-01-07 21:58:35 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1059798 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1059798 | mutz | 2009-12-07 12:21:30 +0100 (Mon, 07 Dec 2009) | 1 line
  
  Test gpg-connect-agent scripts for uiserver sign, encrypt and prep_encrypt commands
........

r1071321 | tmcguire | 2010-01-07 22:00:01 +0100 (Thu, 07 Jan 2010) | 10 lines

SVN_MERGE
Merged revisions 1059801 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1059801 | mutz | 2009-12-07 12:31:24 +0100 (Mon, 07 Dec 2009) | 1 line
  
  docs++ terminate++
........

r1071357 | tmcguire | 2010-01-07 22:47:42 +0100 (Thu, 07 Jan 2010) | 11 lines

SVN_MERGE
Merged revisions 1066570 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1066570 | winterz | 2009-12-27 14:13:20 +0100 (Sun, 27 Dec 2009) | 3 lines
  
  put the Mailbox and AddrSpec ==operators in the KMime::Types namespace
  fixes compiling with mingw
........

r1071373 | tmcguire | 2010-01-07 23:05:52 +0100 (Thu, 07 Jan 2010) | 13 lines

Merged revisions 1068004 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068004 | mutz | 2009-12-31 10:19:58 +0100 (Thu, 31 Dec 2009) | 4 lines
  
  AddUserIDCommand: preset dialog fields from the primary User-ID
  
  This makes for much more rapid user id adding, as in most cases, all you
  want to change is the email address, not real name or comment.
........
SVN_MERGE

r1071375 | tmcguire | 2010-01-07 23:06:23 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1068095 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068095 | mutz | 2009-12-31 12:14:13 +0100 (Thu, 31 Dec 2009) | 1 line
  
  stl_util.h: new range-based algorithm binary_search; new algorithm sort_ed_(), returning a sorted copy
........
SVN_MERGE

r1071376 | tmcguire | 2010-01-07 23:06:55 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1068102 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068102 | mutz | 2009-12-31 12:16:06 +0100 (Thu, 31 Dec 2009) | 1 line
  
  CertifyCertificateDialog: allow to preselect user-id to be certified
........
SVN_MERGE

r1071377 | tmcguire | 2010-01-07 23:07:26 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1068108 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068108 | mutz | 2009-12-31 12:17:10 +0100 (Thu, 31 Dec 2009) | 1 line
  
  CertifyCertificateCommand: preselect user-ids to be certified if that's what was given to the ctor
........
SVN_MERGE

r1071378 | tmcguire | 2010-01-07 23:08:05 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1068132 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068132 | mutz | 2009-12-31 12:49:02 +0100 (Thu, 31 Dec 2009) | 1 line
  
  FileDialog: add getSaveFileNameEx, allowing to pass a proposed file name, and fix dir_id_2_dir_map to actually contain the dirs, and not the files selected.
........
SVN_MERGE

r1071379 | tmcguire | 2010-01-07 23:08:46 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1068137 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068137 | mutz | 2009-12-31 13:06:10 +0100 (Thu, 31 Dec 2009) | 1 line
  
  FileDialog: if proposedFileName is empty, act as non-Ex getSaveFileName
........
SVN_MERGE

r1071380 | tmcguire | 2010-01-07 23:09:19 +0100 (Thu, 07 Jan 2010) | 10 lines

Merged revisions 1068139 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1068139 | mutz | 2009-12-31 13:07:33 +0100 (Thu, 31 Dec 2009) | 1 line
  
  ExportCertificateCommand: if there's only one to export, propse <fingerprint>.{asc,pem} as save file name
........
SVN_MERGE