# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1164564408 -3600
# Node ID 0dc104d51dce6c2a4ab6cd140e806a560660f4ff
# Parent  a3748bd3d0100dc16724d423266f758c1d750f8c
PGP: Better error messages

diff -r a3748bd3d010 -r 0dc104d51dce mcabber/src/pgp.c
--- a/mcabber/src/pgp.c	Sun Nov 26 18:40:05 2006 +0100
+++ b/mcabber/src/pgp.c	Sun Nov 26 19:06:48 2006 +0100
@@ -236,7 +236,7 @@
   }
   if (err)
     scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
-                 "GPGME error: %s", gpgme_strerror(err));
+                 "GPGME verification error: %s", gpgme_strerror(err));
   gpgme_release(ctx);
   g_free(data);
   return verified_key;
@@ -301,7 +301,7 @@
   }
   if (err && err != GPG_ERR_CANCELED)
     scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
-                 "GPGME error: %s", gpgme_strerror(err));
+                 "GPGME signature error: %s", gpgme_strerror(err));
   gpgme_release(ctx);
   return signed_data;
 }
@@ -363,7 +363,7 @@
   }
   if (err && err != GPG_ERR_CANCELED)
     scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
-                 "GPGME error: %s", gpgme_strerror(err));
+                 "GPGME decryption error: %s", gpgme_strerror(err));
   gpgme_release(ctx);
   g_free(data);
   return decrypted_data;
@@ -411,10 +411,13 @@
       gpgme_data_release(in);
     }
     gpgme_key_release(key);
+  } else {
+    scr_LogPrint(LPRINT_LOGNORM, "GPGME encryption error: key not found");
+    err = 0;
   }
   if (err && err != GPG_ERR_CANCELED)
     scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
-                 "GPGME error: %s", gpgme_strerror(err));
+                 "GPGME encryption error: %s", gpgme_strerror(err));
   gpgme_release(ctx);
   edata = strip_header_footer(encrypted_data);
   if (encrypted_data)