[seahorse] Use the right macro names; create GPG_MICRO version macro



commit 5773f60e19156ac4c20a9af5cd3ed15e423a7245
Author: nobled <nobled dreamwidth org>
Date:   Sat Oct 10 00:46:03 2009 -0400

    Use the right macro names; create GPG_MICRO version macro
    
    Signed-off-by: Stef Walter <stef memberwebs com>

 configure.in                |    1 +
 pgp/seahorse-gpgme-key-op.h |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 299ded8..c3ec907 100644
--- a/configure.in
+++ b/configure.in
@@ -119,6 +119,7 @@ else
 				if test "$ver" = "$major.$minor"; then
 					AC_DEFINE_UNQUOTED(GPG_MAJOR, [$major], [GPG Major Version])
 					AC_DEFINE_UNQUOTED(GPG_MINOR, [$minor], [GPG Minor Version])
+					AC_DEFINE_UNQUOTED(GPG_MICRO, [$micro], [GPG Micro Version])
 					ok="yes"
 					break
 				fi
diff --git a/pgp/seahorse-gpgme-key-op.h b/pgp/seahorse-gpgme-key-op.h
index 591427e..5d67a3d 100644
--- a/pgp/seahorse-gpgme-key-op.h
+++ b/pgp/seahorse-gpgme-key-op.h
@@ -38,8 +38,8 @@
  * Key type options. 
  * Sadly these are not consistent between versions of GPG.
  */
-#if ( GPG_MAJOR_VERSION == 2 &&   GPG_MINOR_VERSION == 0 && GPG_MICRO_VERSION < 12 ) || \
-    ( GPG_MAJOR_VERSION == 1 && ( GPG_MINOR_VERSION <  4 || GPG_MICRO_VERSION < 10 ) )
+#if ( GPG_MAJOR == 2 &&   GPG_MINOR == 0 && GPG_MICRO < 12 ) || \
+    ( GPG_MAJOR == 1 && ( GPG_MINOR <  4 || GPG_MICRO < 10 ) )
 
 typedef enum {
 	/* DSA key with ElGamal subkey. The DSA key will have length of 1024,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]