From 8501d1db33e78f0fc19efb1d6b36915ca5ad2c7e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 23 Aug 2015 23:05:39 +0100
Subject: [PATCH] Validate PGP key when chosen for account

---
 src/command/commands.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/command/commands.c b/src/command/commands.c
index e2323ce6..082b1bf8 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -486,8 +486,12 @@ cmd_account(ProfWin *window, const char * const command, gchar **args)
                     }
                     cons_show("");
                 } else if (strcmp(property, "pgpkeyid") == 0) {
-                    accounts_set_pgp_keyid(account_name, value);
-                    cons_show("Updated PGP key ID for account %s: %s", account_name, value);
+                    if (!p_gpg_valid_key(value)) {
+                        cons_show("Invalid PGP key ID specified, see /pgp keys");
+                    } else {
+                        accounts_set_pgp_keyid(account_name, value);
+                        cons_show("Updated PGP key ID for account %s: %s", account_name, value);
+                    }
                     cons_show("");
                 } else if (valid_resource_presence_string(property)) {
                     int intval;