Skip to content

Instantly share code, notes, and snippets.

@pinpox
Created February 14, 2017 18:01
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save pinpox/145dc96f9a55c567cf7521f25f62754b to your computer and use it in GitHub Desktop.
Save pinpox/145dc96f9a55c567cf7521f25f62754b to your computer and use it in GitHub Desktop.
diff --git a/configure.ac b/configure.ac
index d4ee3dc..1d3a54d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ GTK_REQ=3.4.0
GTK_MAX=GTK_VERSION_3_4
GNUPG_ACCEPTED="2.0.12 2.1.4"
-GPGME_REQUIRED=1.0.0
+GPGME_REQUIRED=1.7.0
LIBSECRET_REQUIRED=0.16
AVAHI_GLIB_REQUIRED=0.6
diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c
index a765033..541c09c 100644
--- a/pgp/seahorse-gpgme-key-op.c
+++ b/pgp/seahorse-gpgme-key-op.c
@@ -55,6 +55,7 @@
#define GPG_FULL 4
#define GPG_ULTIMATE 5
+
typedef struct {
GCancellable *cancellable;
gpgme_ctx_t gctx;
@@ -330,7 +331,8 @@ seahorse_gpgme_key_op_edit (gpointer data, gpgme_status_code_t status,
status == GPGME_STATUS_BAD_PASSPHRASE || status == GPGME_STATUS_USERID_HINT ||
status == GPGME_STATUS_SIGEXPIRED || status == GPGME_STATUS_KEYEXPIRED ||
status == GPGME_STATUS_PROGRESS || status == GPGME_STATUS_KEY_CREATED ||
- status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE)
+ status == GPGME_STATUS_ALREADY_SIGNED || status == GPGME_STATUS_MISSING_PASSPHRASE) ||
+ status == GPGME_STATUS_KEY_CONSIDERED))
return parms->err;
g_debug ("[edit key] state: %d / status: %d / args: %s",
@pwithnall
Copy link

The whitespace change around line 22 is unnecessary. Rest looks good.

@muelli
Copy link

muelli commented Feb 14, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment