Thomas McGuire <mcguire@kde.org> committed rGPGMEPP4083c4cba467: Backport r883813 by tmcguire from trunk to the 4.1 branch: (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP6f0a644c9df9: Backport r883812 by tmcguire from trunk to the 4.1 branch: (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP421bb9c84f91: Backport r883815 by tmcguire from trunk to the 4.1 branch: (authored by Thomas McGuire <mcguire@kde.org>).

Allen Winter <winter@kde.org> committed rGPGMEPPbd8bb2b2ee36: backport r894876 by winterz (authored by Allen Winter <winter@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPP2e21e40ade0e: Merged revisions 894879,894881 via svnmerge from (authored by Volker Krause <vkrause@kde.org>).

adriaandegroot committed rGPGMEPPaa0c490f003d: Want cstdlib for std::free (authored by adriaandegroot).

marc committed rGPGMEPP6e424d4e6287: Merged (and extended for new attributes) from e35: (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP6a4c83e54d5e: Merged revisions 930782,930954 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Till Adam <adam@kde.org> committed rGPGMEPPf1724a412b11: Temporarily comment code that crashes on Windows. (authored by Till Adam <adam@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP519c4ca25105: Merged revisions 937851 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPe67a4e6d9a3a: Merged revisions 937906,940157 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPP6210de183361: Better (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPe7004d22a079: Merged revisions 961006 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Till Adam <adam@kde.org> committed rGPGMEPP0955781c7986: Once is enough. (authored by Till Adam <adam@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPc029e84f642b: Remove code accidentally checked in by Till in r961006. (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP5b503cd6c7ef: Merged revisions 961567 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPP538615fbb9a7: --warnings (authored by marc).

marc committed rGPGMEPP3ab5a3e407e7: Partial update to current gpgme SVN - gpgconf and assuan functions are missing… (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP23da88a19b43: Merged revisions 970468 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPb22fb087c6ee: Merged revisions 970460,970465 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPcedb846e0595: Add gpgme_op_assuan_transact support. Experimental, not tested yet! (authored by marc).

marc committed rGPGMEPP92d2aae13453: gpgme++: Add initializeLibrary() function, calling enforced-required… (authored by marc).

marc committed rGPGMEPP944684530001: ++export macros (authored by marc).

marc committed rGPGMEPPec0e46a0c643: Support new gpgme_op_import_keys() (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP757196f3e299: Merged revisions 974183 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPf574f71310d7: Context::importKeys: try the old export-external + import way of importing keys… (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPd503cdd1cbca: Merged revisions 983772 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPP1adc15581f3c: Use keyID() as primaryFingerprint() iff the latter isn't available (external… (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP90ee5b094f16: Merged revisions 983776 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPf5c6724926ba: Merged revisions 985153 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP5a5d3a63ed08: Merged revisions 985250 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPa03ff9c40b09: Make assuan support work, and add {GpgAgent,Scd}GetInfoAssuanTransaction… (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPa2f84194fe18: Merged revisions 985430 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPe0516ed00bc7: * Make the AssuanEngine stuff actually work. (authored by marc).

marc committed rGPGMEPP4156e9fe8141: compile against gpgme w/o assuan support (authored by marc).

Allen Winter <winter@kde.org> committed rGPGMEPP03430fd6ea39: compile with pedantic (authored by Allen Winter <winter@kde.org>).

Allen Winter <winter@kde.org> committed rGPGMEPP41ec3ae8bef7: compile with pedantic (authored by Allen Winter <winter@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP9e97b0ee0b41: SVN_MERGE (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPf4c7a218ca14: SVN_MERGE (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP6aab3634a17c: SVN_MERGE (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPe1de1e632072: Key::mergeWith(): Merge (parts of gpgme_sub_key_t's, too, so we don't lose the… (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPe5f4fd1e6b6b: SVN_MERGE (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPf0c25c7cd0c1: Fix misleading warning (authored by marc).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPff56d33824cc: Merged revisions 1003652 via svnmerge from (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP01a519f64a66: Compile with older gpgme versions (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP3ee71bbcdabd: SVN_MERGE (authored by Thomas McGuire <mcguire@kde.org>).

osterfeld committed rGPGMEPPe0b709085171: Merged revisions 1002906,1003000,1003008,1003073,1003078,1003095,1003401… (authored by osterfeld).

Volker Krause <vkrause@kde.org> committed rGPGMEPPea79992491a2: Merged revisions 1006179-1006180,1006183,1006757,1008509 via svnmerge from (authored by Volker Krause <vkrause@kde.org>).

Allen Winter <winter@kde.org> committed rGPGMEPP8d0bcaaa1ee5: Merged revisions 1008004 via svnmerge from (authored by Allen Winter <winter@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPP753b491d52df: that should be the last missing one (authored by Volker Krause <vkrause@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPPbe7e8e21c589: svnmerge had quite some trouble with this one, I hope it doesn't break too much. (authored by Volker Krause <vkrause@kde.org>).

Allen Winter <winter@kde.org> committed rGPGMEPPe1a2d1f120c9: Merged revisions 1022132 via svnmerge from (authored by Allen Winter <winter@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPPa88120ed57b1: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).

Eduardo Robles Elvira <edulix@gmail.com> committed rGPGMEPP9c8044f6d1a8: Fixing some incorrectly written endifs in GpgmeppConfig.cmake.in which gave… (authored by Eduardo Robles Elvira <edulix@gmail.com>).

Stephen Kelly <steveire@gmail.com> committed rGPGMEPPd494c88aec3f: SVN_MERGE (authored by Stephen Kelly <steveire@gmail.com>).

Volker Krause <vkrause@kde.org> committed rGPGMEPPa50e3a116715: Add support for creating and mounting G13 crypto containers. (authored by Volker Krause <vkrause@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPP36834932d29e: fix crash (authored by Volker Krause <vkrause@kde.org>).

tokoe committed rGPGMEPPbec438113ebd: SVN_SILENT fix krazy issues (authored by tokoe).

Volker Krause <vkrause@kde.org> committed rGPGMEPPf9cd7e6d32f7: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPP61f041622ee7: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP5a5a79c266cf: Fix warning about unused function. (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPbb7f853e6556: Comment out debug output with std::cerr, which is annoying since it (authored by Thomas McGuire <mcguire@kde.org>).

Tom Albers <toma@kde.org> committed rGPGMEPP7b91ee5550ce: Add Q_UNUSED statements in some ELSE statements which don't use don't vars. (authored by Tom Albers <toma@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPP4d794d8ea66b: oops, fix the case that g13 is not available (authored by Volker Krause <vkrause@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPPddfd1506250e: G13 is an engine, not a protocol. (authored by Volker Krause <vkrause@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP6b0e0f4f3d6c: SVN_MERGE: (authored by Thomas McGuire <mcguire@kde.org>).

Volker Krause <vkrause@kde.org> committed rGPGMEPP7ab2ec4f6eeb: Handle GpgME::G13Engine in engine2protocol(). (authored by Volker Krause <vkrause@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP7b7d46f6edc1: SVN_MERGE: (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP588c35836668: SVN_MERGE: (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP9e657f47656c: Add a second constructor, to make this binary compatible again, after the change (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP1fbc5f0c4073: SVN_MERGE: (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPPffed16dab489: SVN_MERGE: (authored by Thomas McGuire <mcguire@kde.org>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP7ec3fefeb239: Revert r1094769, it was not needed. (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPP69faa27f5cc3: gpgme++: on WinCE, avoid use of Boost;String Algo which isn't properly… (authored by marc).

Andreas Holzammer <andy@kdab.com> committed rGPGMEPP0e8108996669: - made kdepimlibs compile for wince (authored by Andreas Holzammer <andy@kdab.com>).

Romain Pokrzywka <romain@kdab.net> committed rGPGMEPPa45ebbae84bc: added static library support for kdepimlibs, and enable it for WinCE (authored by Romain Pokrzywka <romain@kdab.net>).

Thomas McGuire <mcguire@kde.org> committed rGPGMEPP2a3806052eda: SVN_MERGE: (authored by Thomas McGuire <mcguire@kde.org>).

marc committed rGPGMEPPf7757b9c0a7a: EditInteractor: fix one missing #ifdef (authored by marc).

marc committed rGPGMEPP426652aa2b43: gpgme++: hide 'gpg-error' and 'errno' behind the gpgme interface (authored by marc).

Kevin Krammer <kevin.krammer@gmx.at> committed rGPGMEPP879d3cb50c5a: makeError() got renamed to make_error() (authored by Kevin Krammer <kevin.krammer@gmx.at>).

Andreas Holzammer <andy@kdab.com> committed rGPGMEPPff99dd077f7d: - dont check version for wince... it does not fit anyway (authored by Andreas Holzammer <andy@kdab.com>).

marc committed rGPGMEPPf622e01da3f8: GpgME::Exception: use gpgme_str* instead of gpg_str* here, too (authored by marc).

marc committed rGPGMEPPae9c80a6bd55: gpgme++: remove wrong comment (authored by marc).

marc committed rGPGMEPP73697dffe4c0: gpgme++: factor Error's safe_bool code into a macro (authored by marc).

marc committed rGPGMEPP4a949767b79e: gpgme++: deprecate one-arg hasFeature() in favour of the two-arg one (authored by marc).

marc committed rGPGMEPP8862b62227d3: gpgme++: add support for gpgme's gpgconf interface (authored by marc).

marc committed rGPGMEPP51a80c2525ed: gpgme++: collect make_error() copies in util.h (authored by marc).

Andreas Holzammer <andy@kdab.com> committed rGPGMEPP56237ce59085: include the right header (authored by Andreas Holzammer <andy@kdab.com>).

marc committed rGPGMEPPad62b262f282: gpgme++: collect to_pid() copies in util.h (authored by marc).

Christophe Giboudeaux <cgiboudeaux@gmx.com> committed rGPGMEPP418d6fc9c8db: use else() and endif() everywhere (authored by Christophe Giboudeaux <cgiboudeaux@gmx.com>).

marc committed rGPGMEPP769b0d190e20: gpgme++: rename array to unbreak enable-final (authored by marc).

dirkmueller committed rGPGMEPPb4eedd02dd63: add missing break (CID 6408) (authored by dirkmueller).

Guy Maurel <guy-kde@maurel.de> committed rGPGMEPPf3f6db29b365: some more spaces, some less spaces, some more blocks, for gpgme++ (authored by Guy Maurel <guy-kde@maurel.de>).

• aheinecke committed rGPGMEPP88fa78f610f2: Fix wipe function. (authored by • aheinecke).

Kevin Krammer <krammer@kde.org> committed rGPGMEPP4c6cfb96b4d9: Several EBN Krazy fixes (authored by Kevin Krammer <krammer@kde.org>).

Stephen Kelly <steveire@gmail.com> committed rGPGMEPP1d2ec9ffb1e9: Make gpgme++ compile standalone. (authored by dfaure-kdab).

• aheinecke committed rGPGMEPP9b7ab4beded1: Fix upcoming minor GPGME C++ incompatibility (authored by • aheinecke).

• aheinecke committed rGPGMEPPa686f4f7adb9: Merge branch 'KDE/4.10' (authored by • aheinecke).

• aheinecke committed rGPGMEPPaae0e5e440cf: Merge branch 'KDE/4.10' (authored by • aheinecke).

Christophe Giboudeaux <cgiboudeaux@gmx.com> committed rGPGMEPP1733a7fb0659: Merge remote-tracking branch 'origin/master' into frameworks (authored by Christophe Giboudeaux <cgiboudeaux@gmx.com>).