changeset 1049:ad5de4d1ee56

PGP: Give a more useful error message when the private key isn't found
author Mikael Berthe <mikael@lilotux.net>
date Sun, 26 Nov 2006 20:08:18 +0100
parents a743eaa94d94
children ea71d31a2607
files mcabber/src/pgp.c
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/pgp.c	Sun Nov 26 19:24:33 2006 +0100
+++ b/mcabber/src/pgp.c	Sun Nov 26 20:08:18 2006 +0100
@@ -274,12 +274,16 @@
     gpgme_set_passphrase_cb(ctx, passphrase_cb, 0);
 
   err = gpgme_get_key(ctx, gpg.private_key, &key, 1);
-  if (!err) {
-    gpgme_signers_clear(ctx);
-    gpgme_signers_add(ctx, key);
-    gpgme_key_release(key);
-    err = gpgme_data_new_from_mem(&in, gpg_data, strlen(gpg_data), 0);
+  if (err) {
+    scr_LogPrint(LPRINT_LOGNORM, "GPGME error: private key not found");
+    gpgme_release(ctx);
+    return NULL;
   }
+
+  gpgme_signers_clear(ctx);
+  gpgme_signers_add(ctx, key);
+  gpgme_key_release(key);
+  err = gpgme_data_new_from_mem(&in, gpg_data, strlen(gpg_data), 0);
   if (!err) {
     err = gpgme_data_new(&out);
     if (!err) {