SVN_MERGE -- Merged revisions 989925,990113 via svnmerge from svn+ssh…
cd2560736127Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE -- Merged revisions 989925,990113 via svnmerge from svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

........

r989925 | mutz | 2009-07-01 10:55:33 +0200 (Wed, 01 Jul 2009) | 1 line

Make assuan support work, and add {GpgAgent,Scd}GetInfoAssuanTransaction classes (trivial AssuanTransaction's)

........

r990113 | mutz | 2009-07-01 19:24:46 +0200 (Wed, 01 Jul 2009) | 1 line

compile against gpgme w/o assuan support

........

svn path=/trunk/KDE/kdepimlibs/; revision=997010

Details

Provenance

Thomas McGuire <mcguire@kde.org>

Authored on

Parents

rKPLca3c8dad90e1: Make assuan support work, and add {GpgAgent,Scd}GetInfoAssuanTransaction…
rKPLeb6e0b031dce: Make sure that the timer for pending updates is stopped *before* the job…

Branches

Unknown

Tags

Unknown

Event Timeline

Thomas McGuire <mcguire@kde.org> committed rKPLcd2560736127: SVN_MERGE -- Merged revisions 989925,990113 via svnmerge from svn+ssh… (authored by Thomas McGuire <mcguire@kde.org>).Jul 15 2009, 11:05 AM

Merged Changes

ca3c8dad90e1 Make assuan support work, and add {GpgAgent,Scd}GetInfoAssuanTransaction…
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
9a8bfcdd6b28 merge SVN commit 977867 by winterz:
Author
winterz
Browse Repository
No Builds
No Audits
5f1146bb8678 Context::importKeys: try the old export-external + import way of importing keys…
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
3ab73c8e43f7 This will be gpgme++ 2.3.0
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
23f73999ab73 Use keyID() as primaryFingerprint() iff the latter isn't available (external…
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
8b2fcd4a8bf0 Don't crash in invitationPerson() if the email is not found in the address book.
Author
winterz
Browse Repository
No Builds
No Audits
f508b5524dd1 Support new gpgme_op_import_keys()
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
0933e00f0d87 ++export macros
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
b1519253d3d6 gpgme++: Add initializeLibrary() function, calling enforced-required…
Author
Marc Mutz <mutz@kde.org>
Browse Repository
No Builds
No Audits
90011132c903 Add the ms-bitfields option here locally, as rebuilding all the kde stack wiht…
Author
Till Adam <adam@kde.org>
Browse Repository
No Builds
No Audits
e789b1d1a475 Crossport r910076 by krake from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
cd9b48906737 Crossport r883920 by krake from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
32bdbe3cf97b Crossport r982851 by jarmond from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
2fef54faa723 Crossport r982498 by winterz from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
a8d45fdcd7b6 Crossport r982495 by winterz from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
21ecaa56a56b Crossport r981640 by smartins from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
7c235490ca9e Crossport r980672 by winterz from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
babd5ac27c3c First part of this merge
Author
winterz
Browse Repository
No Builds
No Audits
60390c809816 Crossport r977867 by winterz from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
faab9b5b799c the port of kolab/issue3685 bugfix., which I forgot to commit with the comment
Author
winterz
Browse Repository
No Builds
No Audits
b57fd1d7fae8 even more beautification of invitation displays. String changes though.
Author
winterz
Browse Repository
No Builds
No Audits
7a8f92c55c47 beautify invitation display. no new strings.
Author
winterz
Browse Repository
No Builds
No Audits
d8832702afef Merged revisions 977496 via svnmerge from https://svn.kde.
Author
winterz
Browse Repository
No Builds
No Audits
570d1e5fd964 Crossport r976960 by vkrause from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
3b8d70a10ed6 Crossport r976063 by mleupold from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits
7277ca8d7f95 Crossport r976039 by tmcguire from trunk to the enterprise4 branch:
Author
Thomas McGuire <mcguire@kde.org>
Browse Repository
No Builds
No Audits

Changes (8)

Path

Size

gpgme++/

CMakeLists.txt

context.cpp

context.h

gpgagentgetinfoassuantransaction.cpp

gpgagentgetinfoassuantransaction.h

interfaces/

assuantransaction.h

scdgetinfoassuantransaction.cpp

scdgetinfoassuantransaction.h

rKPLcd2560736127

View Options

gpgme++/CMakeLists.txt

View Options

gpgme++/context.cpp

View Options

gpgme++/context.h

View Options

gpgme++/gpgagentgetinfoassuantransaction.cpp

View Options

gpgme++/gpgagentgetinfoassuantransaction.h

View Options

gpgme++/interfaces/assuantransaction.h

View Options

gpgme++/scdgetinfoassuantransaction.cpp

View Options

gpgme++/scdgetinfoassuantransaction.h

SVN_MERGE -- Merged revisions 989925,990113 via svnmerge from svn+ssh…cd2560736127UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (8)

rKPLcd2560736127

gpgme++/CMakeLists.txt

gpgme++/context.cpp

gpgme++/context.h

gpgme++/gpgagentgetinfoassuantransaction.cpp

gpgme++/gpgagentgetinfoassuantransaction.h

gpgme++/interfaces/assuantransaction.h

gpgme++/scdgetinfoassuantransaction.cpp

gpgme++/scdgetinfoassuantransaction.h

SVN_MERGE -- Merged revisions 989925,990113 via svnmerge from svn+ssh…
cd2560736127Unpublished
Actions