Bugfix #949: (a) call gpgme_check_version(NULL) during initialization and (b) provide...

diff --git a/trunk/gpgmeplug/cryptplug.h b/trunk/gpgmeplug/cryptplug.h
index c07f4cf887e10e590576fce96a0bb8b23f208b46..03b1715b996b1e9d090283d1aef83ad240529c3e 100644 (file)
--- a/trunk/gpgmeplug/cryptplug.h
+++ b/trunk/gpgmeplug/cryptplug.h
@@ -300,6 +300,19 @@ typedef unsigned long SigStatusFlags;
 
 
 
+/*! \ingroup groupGeneral
+    \brief This function returns the version string of this cryptography
+           plug-in.
+
+   If the plugins initialization fails the calling process might want
+   to display the library version number to the user for checking if
+   there is an old version of the library installed...
+   
+   \note This function <b>must</b> be implemented by each plug-in using
+   this API specification.
+*/
+const char* libVersion( void );
+
 /*! \ingroup groupGeneral
     \brief This function returns a URL to be used for reporting a bug that
            you found (or suspect, resp.) in this cryptography plug-in.

diff --git a/trunk/gpgmeplug/gpgmeplug.c b/trunk/gpgmeplug/gpgmeplug.c
index 217cca1295f61f381738533c09eb5db2b67ff56a..6d4c700cbe9133016022a115698b862d3640e912 100644 (file)
--- a/trunk/gpgmeplug/gpgmeplug.c
+++ b/trunk/gpgmeplug/gpgmeplug.c
@@ -192,6 +192,7 @@ typedef struct {
   bool                    certificateInChainExpiryNearWarning;
   int                     certificateInChainExpiryNearWarningInterval;
   bool                    receiverEmailAddressNotInCertificateWarning;
+  const char* libVersion; // a statically allocated string with the GPGME Version used
 } Config;
 
 
@@ -243,8 +244,8 @@ bool initialize()
   config.certificateInChainExpiryNearWarning          = true;
   config.certificateInChainExpiryNearWarningInterval  = NEAR_EXPIRY;
   config.receiverEmailAddressNotInCertificateWarning  = true;
-
-  return true;
+  config.libVersion = gpgme_check_version (NULL);
+  return (gpgme_engine_check_version (GPGMEPLUG_PROTOCOL) == GPGME_No_Error);
 };
 
 
@@ -286,6 +287,9 @@ bool hasFeature( Feature flag )
 }
 
 
+const char* libVersion(){ return config.libVersion; }
+
+
 const char* bugURL(){ return config.bugURL; }