From b1ab4b28545de482106315722c47e0fb741a275e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 23 Aug 2015 23:09:44 +0100
Subject: [PATCH] Added JID to log when failing to load PGP fingerprint

Added PGP stub for tests
---
 src/pgp/gpg.c                  | 2 +-
 tests/unittests/pgp/stub_gpg.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pgp/gpg.c b/src/pgp/gpg.c
index be35bb3a..81462f80 100644
--- a/src/pgp/gpg.c
+++ b/src/pgp/gpg.c
@@ -153,7 +153,7 @@ p_gpg_on_connect(const char * const barejid)
             error = gpgme_get_key(ctx, keyid, &key, 1);
             g_free(keyid);
             if (error || key == NULL) {
-                log_error("GPG: Failed to get key. %s %s", gpgme_strsource(error), gpgme_strerror(error));
+                log_warning("GPG: Failed to get key for %s: %s %s", jid, gpgme_strsource(error), gpgme_strerror(error));
                 continue;
             }
 
diff --git a/tests/unittests/pgp/stub_gpg.c b/tests/unittests/pgp/stub_gpg.c
index f8e05d57..577f7d66 100644
--- a/tests/unittests/pgp/stub_gpg.c
+++ b/tests/unittests/pgp/stub_gpg.c
@@ -30,6 +30,11 @@ char* p_gpg_sign(const char * const str, const char * const fp)
     return NULL;
 }
 
+gboolean p_gpg_valid_key(const char * const keyid)
+{
+    return FALSE;
+}
+
 gboolean p_gpg_available(const char * const barejid)
 {
     return FALSE;