r1143955 | cgiboudeaux | 2010-06-29 10:45:10 +0200 (Tue, 29 Jun 2010) | 1 line

Bump version.

r1143988 | cgiboudeaux | 2010-06-29 11:29:28 +0200 (Tue, 29 Jun 2010) | 1 line

Bump version. Trunk is now 4.6 pre

r1143994 | tmcguire | 2010-06-29 11:38:32 +0200 (Tue, 29 Jun 2010) | 1 line

bump version

r1144010 | skelly | 2010-06-29 12:01:50 +0200 (Tue, 29 Jun 2010) | 1 line

Update with kdepimlibs version.

r1144026 | skelly | 2010-06-29 12:27:20 +0200 (Tue, 29 Jun 2010) | 1 line

Fix silly error using wrong index.

r1144033 | scripty | 2010-06-29 12:28:51 +0200 (Tue, 29 Jun 2010) | 1 line

SVN_SILENT made messages (.desktop file)

r1144056 | winterz | 2010-06-29 12:48:50 +0200 (Tue, 29 Jun 2010) | 4 lines

use Nuno's new icon for posting to a mailing list.
he named it mail-list-message-new instead of mail-message-new-list

r1144060 | tmcguire | 2010-06-29 12:58:51 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117561 | mutz | 2010-04-22 15:54:08 +0200 (Thu, 22 Apr 2010) | 1 line

  Input: allow to pass a QByteArray to the process' stdin
........

r1144063 | tmcguire | 2010-06-29 13:01:46 +0200 (Tue, 29 Jun 2010) | 17 lines

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

........
  r1117562 | mutz | 2010-04-22 15:54:09 +0200 (Thu, 22 Apr 2010) | 8 lines

  ArchiveDefinition: Extend syntax of pack-command config key to allow passing filenames via stdin:

  1. newline-separated: pack-command=|command
  2. nul-byte-separated: pack-command=0|command

  Tested with pack-command=0|xargs -0 tar cf - on Linux.

  Implements kolab/issue4298 (gpg4win2).
........

r1144065 | tmcguire | 2010-06-29 13:06:52 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117592 | mutz | 2010-04-22 16:58:52 +0200 (Thu, 22 Apr 2010) | 1 line

  doc/kleopatra: Document [Archive Definition #n] config keys.
........

r1144068 | tmcguire | 2010-06-29 13:08:11 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117829 | mutz | 2010-04-23 09:48:38 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: mention that quoting works
........

r1144069 | tmcguire | 2010-06-29 13:09:15 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117830 | mutz | 2010-04-23 09:48:41 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: add a note about backslashes in [Archive Definition]/pack-command
........

r1144070 | tmcguire | 2010-06-29 13:00:47 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117831 | mutz | 2010-04-23 09:48:43 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: better formatting of one-line <programlisting>s
........

r1144071 | tmcguire | 2010-06-29 13:11:29 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117832 | mutz | 2010-04-23 09:48:45 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: <variablelist> -> <orderedlist> in discussion about filename passing to archivers
........

r1144076 | tmcguire | 2010-06-29 13:12:29 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117933 | mutz | 2010-04-23 15:23:37 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: use <envar> instead of <varname> for environment variables
........

r1144079 | tmcguire | 2010-06-29 13:13:28 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117934 | mutz | 2010-04-23 15:23:40 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: ++ids
........

r1144081 | tmcguire | 2010-06-29 13:14:27 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117935 | mutz | 2010-04-23 15:23:42 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: make the filename passing discussion a <sect2>
........

r1144083 | tmcguire | 2010-06-29 13:15:26 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117936 | mutz | 2010-04-23 15:23:44 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: document [Checksum Definition #n] config keys
........

r1144084 | tmcguire | 2010-06-29 13:16:28 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1117937 | mutz | 2010-04-23 15:23:46 +0200 (Fri, 23 Apr 2010) | 1 line

  doc/kleopatra: adjust copyrights of Kleopatra and her documentation
........

r1144093 | winterz | 2010-06-29 13:34:41 +0200 (Tue, 29 Jun 2010) | 3 lines

the mail-list-message-new icon was renamed to mail-message-new-list,
per Pino and Nuno.

r1144094 | lfranchi | 2010-06-29 13:35:39 +0200 (Tue, 29 Jun 2010) | 2 lines

Don't allow user to save encrypted draft with no recipient.

r1144098 | tmcguire | 2010-06-29 13:41:48 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1118263 | mutz | 2010-04-24 09:16:32 +0200 (Sat, 24 Apr 2010) | 1 line

  ArchiveDefinition: fix assertion
........

r1144099 | tmcguire | 2010-06-29 13:43:10 +0200 (Tue, 29 Jun 2010) | 16 lines

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

........
  r1118264 | mutz | 2010-04-24 09:16:35 +0200 (Sat, 24 Apr 2010) | 7 lines

  ChecksumDefinition: allow same argument passing options as ArchiveDefinition

  1. Parse '|' and '0|' prefixes of commands
  2. Move responsibility for starting processes to ChecksumDefinition
     (from Create/VerifyChecksumsController)

  Implements kolab/issue4294.
........

r1144100 | tmcguire | 2010-06-29 13:44:18 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1118265 | mutz | 2010-04-24 09:16:37 +0200 (Sat, 24 Apr 2010) | 1 line

  ProcessStdOutInput: add missing return statement
........

r1144102 | tmcguire | 2010-06-29 13:45:24 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1118266 | mutz | 2010-04-24 09:16:39 +0200 (Sat, 24 Apr 2010) | 1 line

  ArchiveDefiniton, ChecksumDefinition: don't pass filenames on the command line when passing them on stdin already
........

r1144104 | tmcguire | 2010-06-29 13:51:38 +0200 (Tue, 29 Jun 2010) | 19 lines

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

........
  r1118267 | mutz | 2010-04-24 09:16:42 +0200 (Sat, 24 Apr 2010) | 10 lines

  libkleopatrarc: make argument passing more robust for Archive and Checksum Definitions

  This requires GNU-compatible tools (for -- and tar --null), and a POSIX system (for xargs),
  so it won't work on Windows out of the box (it never did, anyway, unless you had the tools
  in PATH). ZIP cannot be called safely, since it accepts options after positional parameters,
  doesn't support --, and can accept filenames on stdin only in a newline-separated way (which
  breaks when filenames contain newlines).

  We might need a way to specify which platform a given Archive Definition / Checksum Definition
  is compatible with...
........

r1144106 | tmcguire | 2010-06-29 13:53:55 +0200 (Tue, 29 Jun 2010) | 13 lines

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

........
  r1119583 | mutz | 2010-04-27 14:54:15 +0200 (Tue, 27 Apr 2010) | 4 lines

  MainWindow; revert commit 1010968

  There is no such thing as a "secret certificate"...
  CCMAIL:mcguire@kde.org
........

r1144107 | tmcguire | 2010-06-29 13:55:29 +0200 (Tue, 29 Jun 2010) | 12 lines

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

........
  r1119584 | mutz | 2010-04-27 14:54:18 +0200 (Tue, 27 Apr 2010) | 3 lines

  kleopatra.rc: remove old action name

  It's been called crl_import_crls for some time now.
........

r1144109 | mutz | 2010-06-29 13:56:11 +0200 (Tue, 29 Jun 2010) | 1 line

messagefactorytest.cpp: output diffs of (long) string mismatches

r1144110 | lfranchi | 2010-06-29 13:57:15 +0200 (Tue, 29 Jun 2010) | 2 lines

Fix wrong logic

r1144113 | tmcguire | 2010-06-29 13:59:56 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119585 | mutz | 2010-04-27 14:54:20 +0200 (Tue, 27 Apr 2010) | 1 line

  checksumdefinition.cpp: compile on platforms that #define stdin
........

r1144121 | smartins | 2010-06-29 14:11:06 +0200 (Tue, 29 Jun 2010) | 11 lines

Recorded merge of revisions 1144116 via svnmerge from 
svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1144116 | smartins | 2010-06-29 13:07:01 +0100 (Tue, 29 Jun 2010) | 4 lines

  Backport beginBatchAdding and endBatchAdding signals from trunk

  MERGE: none
........

r1144126 | tmcguire | 2010-06-29 14:14:45 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119586 | mutz | 2010-04-27 14:54:23 +0200 (Tue, 27 Apr 2010) | 1 line

  doc/kleopatra: <link>..lots of repetition...</link> --> <xref/>
........

r1144127 | tmcguire | 2010-06-29 14:15:46 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119587 | mutz | 2010-04-27 14:54:26 +0200 (Tue, 27 Apr 2010) | 1 line

  doc/kleopatra: "LDAB" -> "&ldap;"
........

r1144128 | tmcguire | 2010-06-29 14:16:46 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119588 | mutz | 2010-04-27 14:54:28 +0200 (Tue, 27 Apr 2010) | 1 line

  doc/kleopatra: update version, date, and keywords
........

r1144129 | tmcguire | 2010-06-29 14:17:46 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119628 | mutz | 2010-04-27 16:01:42 +0200 (Tue, 27 Apr 2010) | 1 line

  doc/kleopatra: Update File menu reference section.
........

r1144130 | tmcguire | 2010-06-29 14:18:46 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119978 | mutz | 2010-04-28 07:21:42 +0200 (Wed, 28 Apr 2010) | 1 line

  doc/kleopatra: Update View menu reference section.
........

r1144133 | tmcguire | 2010-06-29 14:19:49 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119979 | mutz | 2010-04-28 07:21:45 +0200 (Wed, 28 Apr 2010) | 1 line

  doc/kleopatra: Update Certificates menu reference section.
........

r1144134 | tmcguire | 2010-06-29 14:20:49 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120031 | mutz | 2010-04-28 09:51:31 +0200 (Wed, 28 Apr 2010) | 1 line

  doc/kleopatra: fix typo
........

r1144135 | tmcguire | 2010-06-29 14:21:53 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120064 | mutz | 2010-04-28 11:36:55 +0200 (Wed, 28 Apr 2010) | 1 line

  doc/kleopatra: move warning around, fix typo
........

r1144137 | tmcguire | 2010-06-29 14:22:54 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120578 | mutz | 2010-04-29 12:35:29 +0200 (Thu, 29 Apr 2010) | 1 line

  doc/kleopatra: comment out "keybox management" section, which is hopelessly outdated
........

r1144138 | mutz | 2010-06-29 14:23:09 +0200 (Tue, 29 Jun 2010) | 1 line

messagefactorytest.cpp: fix expected value for testCreateResend()

r1144141 | tmcguire | 2010-06-29 14:28:47 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120579 | mutz | 2010-04-29 12:35:32 +0200 (Thu, 29 Apr 2010) | 1 line

  doc/kleopatra: correct location of gpgconf-driven backend configuration dialog
........

r1144143 | tmcguire | 2010-06-29 14:29:47 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120580 | mutz | 2010-04-29 12:35:34 +0200 (Thu, 29 Apr 2010) | 1 line

  doc/kleopatra: Update Tools menu reference section.
........

r1144144 | tmcguire | 2010-06-29 14:30:47 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120581 | mutz | 2010-04-29 12:35:36 +0200 (Thu, 29 Apr 2010) | 1 line

  doc/kleopatra: Update Settings menu reference section.
........

r1144145 | tmcguire | 2010-06-29 14:31:47 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120637 | mutz | 2010-04-29 16:19:06 +0200 (Thu, 29 Apr 2010) | 1 line

  doc/kleopatra: "CA" ->
........

r1144146 | tmcguire | 2010-06-29 14:32:47 +0200 (Tue, 29 Jun 2010) | 12 lines

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

........
  r1120638 | mutz | 2010-04-29 16:19:07 +0200 (Thu, 29 Apr 2010) | 3 lines

  doc/kleopatra: add dummy chapters for some Config Dialog pages

  This is so we can use them as <xref/> targets already.
........

r1144147 | tmcguire | 2010-06-29 14:33:48 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1120639 | mutz | 2010-04-29 16:19:08 +0200 (Thu, 29 Apr 2010) | 1 line

  doc/kleopatra: Update Settings / Directory Services reference section.
........

r1144148 | tmcguire | 2010-06-29 14:34:47 +0200 (Tue, 29 Jun 2010) | 13 lines

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

........
  r1121029 | mutz | 2010-04-30 09:56:59 +0200 (Fri, 30 Apr 2010) | 4 lines

  doc/kleopatra: remove leading and trailing whitespace in <title>

  Either DocBook itself or the KDE stylesheet is buggy and doesn't remove it
  before using the content between quotes in an <xref/>.
........

r1144149 | tmcguire | 2010-06-29 14:35:47 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1121032 | mutz | 2010-04-30 09:57:06 +0200 (Fri, 30 Apr 2010) | 1 line

  doc/kleopatra: Update Settings / Appearance reference section.
........

r1144151 | tmcguire | 2010-06-29 14:36:48 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122089 | mutz | 2010-05-03 09:26:28 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: remove cut'n'paste rubbish
........

r1144152 | tmcguire | 2010-06-29 14:37:48 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122091 | mutz | 2010-05-03 09:26:34 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: Add Settings / Crypto Operations reference section
........

r1144153 | tmcguire | 2010-06-29 14:38:48 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122092 | mutz | 2010-05-03 09:26:38 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: adjust emacs local variables to what's actually used
........

r1144155 | tmcguire | 2010-06-29 14:39:53 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122093 | mutz | 2010-05-03 09:26:41 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: "CRL" -> "&crl;"
........

r1144157 | tmcguire | 2010-06-29 14:40:57 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122094 | mutz | 2010-05-03 09:26:44 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: add missing id
........

r1144158 | tmcguire | 2010-06-29 14:41:58 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122095 | mutz | 2010-05-03 09:26:47 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: Add Settings / S/MIME Validation reference section
........

r1144159 | tmcguire | 2010-06-29 14:42:58 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122096 | mutz | 2010-05-03 09:26:50 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: grammar, and link to now-existing "S/MIME Validation"-Entry.
........

r1144162 | tmcguire | 2010-06-29 14:43:59 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122377 | mutz | 2010-05-03 20:29:34 +0200 (Mon, 03 May 2010) | 1 line

  doc/kleopatra: Paint out Settings / GnuPG System reference section
........

r1144168 | tmcguire | 2010-06-29 14:47:31 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1119589 | mutz | 2010-04-27 14:54:31 +0200 (Tue, 27 Apr 2010) | 1 line

  kleopatra/input.cpp: compile on platforms that #define stdin
........

r1144170 | tmcguire | 2010-06-29 14:49:00 +0200 (Tue, 29 Jun 2010) | 16 lines

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

........
  r1121030 | mutz | 2010-04-30 09:57:01 +0200 (Fri, 30 Apr 2010) | 7 lines

  AppearanceConfigWidget: reorganize

  1. Rename tab General to Tooltips
  2. Replace groupbox "Tooltips" with a label.
  3. Show certificate details -> Show technical details
  4. Rename tab Certificate Filters to Certificate Categories
     (to match handbook terminology).
........

r1144172 | cgiboudeaux | 2010-06-29 14:53:28 +0200 (Tue, 29 Jun 2010) | 1 line

Fix includes.

r1144173 | lfranchi | 2010-06-29 14:59:52 +0200 (Tue, 29 Jun 2010) | 2 lines

Use preferred charset list when creating OTP text content.

r1144175 | lfranchi | 2010-06-29 15:01:41 +0200 (Tue, 29 Jun 2010) | 2 lines

Update expected value to include From: field

r1144178 | smartins | 2010-06-29 15:10:55 +0200 (Tue, 29 Jun 2010) | 12 lines

SVN_SILENT:
Recorded merge of revisions 1144177 via svnmerge from 
svn+ssh://smartins@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1144177 | smartins | 2010-06-29 14:08:30 +0100 (Tue, 29 Jun 2010) | 4 lines

  When adding many incidences, don't ask which calendar to put it in, for each incidence.

  MERGE none, already in trunk
........

r1144184 | tmcguire | 2010-06-29 15:21:22 +0200 (Tue, 29 Jun 2010) | 12 lines

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

........
  r1121031 | mutz | 2010-04-30 09:57:03 +0200 (Fri, 30 Apr 2010) | 3 lines

  KeyListController: shuffle around tooltip information sets' contents

  This is hopefully more balanced and logical.
........

r1144186 | tmcguire | 2010-06-29 15:22:25 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1121046 | mutz | 2010-04-30 10:37:50 +0200 (Fri, 30 Apr 2010) | 1 line

  KeyTreeView: just in case, check for NULL models when switching hierarchial view on/off
........

r1144187 | tmcguire | 2010-06-29 15:23:24 +0200 (Tue, 29 Jun 2010) | 12 lines

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

........
  r1121048 | mutz | 2010-04-30 10:37:53 +0200 (Fri, 30 Apr 2010) | 3 lines

  Fix flat mode not working.

  kolab/issue4327 (gpg4win).
........

r1144190 | tmcguire | 2010-06-29 15:25:42 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122088 | mutz | 2010-05-03 09:26:23 +0200 (Mon, 03 May 2010) | 1 line

  CryptoOperationsConfigWidget: rename Checksum Operations tab to File Operations
........

r1144191 | tmcguire | 2010-06-29 15:27:14 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122090 | mutz | 2010-05-03 09:26:31 +0200 (Mon, 03 May 2010) | 1 line

  CryptoOperationsConfigWidget: better wording of checksumDefinitionCB's what's this help text
........

r1144192 | tmcguire | 2010-06-29 15:28:28 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1122097 | mutz | 2010-05-03 09:26:53 +0200 (Mon, 03 May 2010) | 1 line

  SMimeValidationConfigurationWidget: small what's this fixes, adding one more what's this text
........

r1144193 | tmcguire | 2010-06-29 15:30:10 +0200 (Tue, 29 Jun 2010) | 13 lines

SVN_SILENT:
Recorded merge of revisions 1137881 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1137881 | winterz | 2010-06-14 16:50:31 +0200 (Mon, 14 Jun 2010) | 5 lines

  include <cstdio> for the FILE definition.
  http://reviewboard.kde.org/r/4294
  CCMAIL: avg@icyb.net.ua
  MERGE: trunk,4.4,3.5?
........

r1144196 | tmcguire | 2010-06-29 15:31:57 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1139103 | eschuetze | 2010-06-17 12:31:17 +0200 (Thu, 17 Jun 2010) | 2 lines

  Changed icon.
........

r1144202 | tmcguire | 2010-06-29 15:38:01 +0200 (Tue, 29 Jun 2010) | 12 lines

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

........
  r1139173 | tmcguire | 2010-06-17 16:49:27 +0200 (Thu, 17 Jun 2010) | 4 lines

  Change the english version of there strings as well.

  CCMAIL: emanuel@intevation.de
........

r1144203 | tmcguire | 2010-06-29 15:39:28 +0200 (Tue, 29 Jun 2010) | 12 lines

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

........
  r1141638 | mutz | 2010-06-23 08:19:36 +0200 (Wed, 23 Jun 2010) | 3 lines

  Selectively revert commit 1139173

  There's no such thing as "public certificate" or "secret certificate".
........

r1144204 | tmcguire | 2010-06-29 15:44:15 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1141636 | mutz | 2010-06-23 08:07:38 +0200 (Wed, 23 Jun 2010) | 1 line

  kleopatra_signencryptfiles.desktop: use "Sign & Encrypt", not "Encrypt & Sign", for consistency
........

r1144205 | tmcguire | 2010-06-29 15:45:39 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1141637 | mutz | 2010-06-23 08:07:47 +0200 (Wed, 23 Jun 2010) | 1 line

  Actually add the --sign-encrypt command line switch to Kleopatra that we use in the Konqueror "plugins"
........

r1144207 | tmcguire | 2010-06-29 15:46:54 +0200 (Tue, 29 Jun 2010) | 10 lines

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

........
  r1142558 | mutz | 2010-06-25 09:12:39 +0200 (Fri, 25 Jun 2010) | 1 line

  FindAssuan2.cmake: On Windows, find the assuan v2 lib by the dllname "assuan-0" (sic!)
........

r1144260 | lfranchi | 2010-06-29 16:46:16 +0200 (Tue, 29 Jun 2010) | 2 lines

New smime key that is properly added to keychain. ATM it pops up a pinentry dialog even though the key is passphrase-less, and just pressing enter works.

r1144268 | skelly | 2010-06-29 17:00:23 +0200 (Tue, 29 Jun 2010) | 1 line

Use the kdelibs version directly in trunk.

r1144276 | skelly | 2010-06-29 17:09:29 +0200 (Tue, 29 Jun 2010) | 4 lines

Revert "Use the kdelibs version directly in trunk."

We rely on kdelibs 4.4 in trunk still.
This reverts commit aee931fad97409fc5fd7c0f6b36afbd3ab86b30f.

r1144281 | skelly | 2010-06-29 17:15:12 +0200 (Tue, 29 Jun 2010) | 1 line

Update with version from kdelibs trunk

r1144291 | ervin | 2010-06-29 17:38:44 +0200 (Tue, 29 Jun 2010) | 3 lines

In case of connection loss, ditch the main session pointer before the
reconnect. It's invalid now anyway.

r1144304 | tmcguire | 2010-06-29 17:58:37 +0200 (Tue, 29 Jun 2010) | 8 lines

Add context to the "&Add" string.

This is necessary because "&Add" is in multiple catalogs,
with different meanings. For example, in German, it is
sometimes translated as "Neu" and sometimes as "Hinzufügen".

Part of kolab/issue4264
SVN_MERGE

r1144305 | tmcguire | 2010-06-29 18:01:15 +0200 (Tue, 29 Jun 2010) | 18 lines

SVN_SILENT:
Recorded merge of revisions 1122624 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1122624 | tmcguire | 2010-05-04 12:54:21 +0200 (Tue, 04 May 2010) | 10 lines

  Add context to the "&Add" string.

  This is necessary because "&Add" is in multiple catalogs,
  with different meanings. For example, in German, it is
  sometimes translated as "Neu" and sometimes as "Hinzufügen".

  MERGE: trunk (but there, it is probably possible to keep the
                string in the UI file)
  Part of kolab/issue4264
........

r1144366 | tmcguire | 2010-06-29 20:50:09 +0200 (Tue, 29 Jun 2010) | 3 lines

Remove email support in the groupwise wizard.

It didn't work anyway, is it modified the old KMail config file.

r1144367 | tmcguire | 2010-06-29 20:50:15 +0200 (Tue, 29 Jun 2010) | 1 line

Port to new identity API.

r1144368 | tmcguire | 2010-06-29 20:50:17 +0200 (Tue, 29 Jun 2010) | 1 line

Add an editor for email aliases to the identity dialog.

r1144370 | tmcguire | 2010-06-29 20:53:24 +0200 (Tue, 29 Jun 2010) | 23 lines

SVN_SILENT:
Recorded merge of revisions 1122656,1122659 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1122656 | mutz | 2010-05-04 14:25:06 +0200 (Tue, 04 May 2010) | 8 lines

  libkpimidentities: add email aliases to Identity; use them in KMail, KOrg, wizards/

  With this patch, KMail allows an identity to have arbitrarily many email 
  aliases. Aliases are email addresses that are considered representing the 
  identity, but that will not be used for outgoing messages.

  The immediate problem this is fixing is that hitting 'A' on a message with 
  an old (=alias) address includes that (old/alias) address in the list of To's.
........
  r1122659 | mutz | 2010-05-04 14:36:57 +0200 (Tue, 04 May 2010) | 3 lines

  IdentityDialog: use a SimpleStringListEditor instead of QTextEdit

  Thanks to Thomas for the suggestion.
........

r1144386 | tmcguire | 2010-06-29 21:28:02 +0200 (Tue, 29 Jun 2010) | 4 lines

Fix inverted logic in initFromMessage().

Read the identity from the original message, not from the new one.
Now email aliases finally work correctly.

r1144401 | cgiboudeaux | 2010-06-29 22:48:15 +0200 (Tue, 29 Jun 2010) | 1 line

Both kdepim and kdepim-runtime require kdepimlibs 4.5.60 (changes in kpimidentities)

r1144411 | tmcguire | 2010-06-29 23:14:20 +0200 (Tue, 29 Jun 2010) | 1 line

Compile

r1144451 | lfranchi | 2010-06-30 01:09:37 +0200 (Wed, 30 Jun 2010) | 4 lines

Fix endless loop on parsing encrypted messages with embedded messages.

BUG: 236737

r1144531 | scripty | 2010-06-30 09:23:21 +0200 (Wed, 30 Jun 2010) | 1 line

SVN_SILENT made messages (.desktop file)

r1144540 | cgiboudeaux | 2010-06-30 10:20:20 +0200 (Wed, 30 Jun 2010) | 1 line

Fix a build error reported on CDash.

r1144618 | mikemcquaid | 2010-06-30 13:38:47 +0200 (Wed, 30 Jun 2010) | 2 lines

Got married, changed my name. Update it so people can contact me.

r1144640 | skelly | 2010-06-30 14:39:51 +0200 (Wed, 30 Jun 2010) | 1 line

Build.

r1144674 | lfranchi | 2010-06-30 16:18:18 +0200 (Wed, 30 Jun 2010) | 2 lines

Grey out composer window as soon as Send is pressed, not after emails are resolved.

r1144684 | yurchor | 2010-06-30 16:30:07 +0200 (Wed, 30 Jun 2010) | 1 line

typo fix

r1144687 | cgiboudeaux | 2010-06-30 16:36:46 +0200 (Wed, 30 Jun 2010) | 3 lines

Move or copy the icons used in messagelist.
CCBUG: 243256

r1144690 | cgiboudeaux | 2010-06-30 16:40:43 +0200 (Wed, 30 Jun 2010) | 1 line

Cleanup

r1144717 | skelly | 2010-06-30 17:33:29 +0200 (Wed, 30 Jun 2010) | 1 line

Implement headerData.

r1144722 | vkrause | 2010-06-30 17:47:33 +0200 (Wed, 30 Jun 2010) | 2 lines

compile