diff --git a/src/ChangeLog b/src/ChangeLog
index e50d8119..196be97c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-28  Marcus Brinkmann  <marcus@g10code.de>
+
+	* signers.c, encrypt-sign.c, encrypt.c, delete.c, keylist.c,
+	edit.c, import.c, export.c: Fix last change in debug output.
+
 2009-10-27  Marcus Brinkmann  <marcus@g10code.de>
 
 	* edit.c (gpgme_op_edit_start, gpgme_op_edit)
diff --git a/src/delete.c b/src/delete.c
index 1fd5bd8e..bfb980a3 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -96,7 +96,7 @@ gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key,
 {
   TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx,
 	      "key=%p (%s), allow_secret=%i", key,
-	      (key->subkeys && !key->subkeys->fpr) ? 
+	      (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid", allow_secret);
   return TRACE_ERR (delete_start (ctx, 0, key, allow_secret));
 }
@@ -111,7 +111,7 @@ gpgme_op_delete (gpgme_ctx_t ctx, const gpgme_key_t key, int allow_secret)
 
   TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx,
 	      "key=%p (%s), allow_secret=%i", key,
-	      (key->subkeys && !key->subkeys->fpr) ? 
+	      (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid", allow_secret);
   err = delete_start (ctx, 1, key, allow_secret);
   if (!err)
diff --git a/src/edit.c b/src/edit.c
index edf20894..14f6f603 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -141,7 +141,7 @@ gpgme_op_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 {
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit_start", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && !key->subkeys->fpr) ? 
+	      (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
   return TRACE_ERR (edit_start (ctx, 0, 0, key, fnc, fnc_value, out));
 }
@@ -157,7 +157,7 @@ gpgme_op_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_edit", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && !key->subkeys->fpr) ? 
+	      (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
 
   err = edit_start (ctx, 1, 0, key, fnc, fnc_value, out);
@@ -175,7 +175,7 @@ gpgme_op_card_edit_start (gpgme_ctx_t ctx, gpgme_key_t key,
 {
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit_start", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && !key->subkeys->fpr) ? 
+	      (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
   return TRACE_ERR (edit_start (ctx, 0, 1, key, fnc, fnc_value, out));
 }
@@ -191,7 +191,7 @@ gpgme_op_card_edit (gpgme_ctx_t ctx, gpgme_key_t key,
 
   TRACE_BEG5 (DEBUG_CTX, "gpgme_op_card_edit", ctx,
 	      "key=%p (%s), fnc=%p fnc_value=%p, out=%p", key,
-	      (key->subkeys && !key->subkeys->fpr) ? 
+	      (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid", fnc, fnc_value, out);
   err = edit_start (ctx, 1, 1, key, fnc, fnc_value, out);
   if (!err)
diff --git a/src/encrypt-sign.c b/src/encrypt-sign.c
index c80cb2a1..a381cfc0 100644
--- a/src/encrypt-sign.c
+++ b/src/encrypt-sign.c
@@ -101,8 +101,8 @@ gpgme_op_encrypt_sign_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
 	{
-	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-		      (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+		      (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
 		      recp[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
@@ -131,8 +131,8 @@ gpgme_op_encrypt_sign (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
 	{
-	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-		      (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+		      (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
 		      recp[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
diff --git a/src/encrypt.c b/src/encrypt.c
index c59292ff..12197925 100644
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -236,8 +236,8 @@ gpgme_op_encrypt_start (gpgme_ctx_t ctx, gpgme_key_t recp[],
 
       while (recp[i])
 	{
-	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i,recp[i],
-		      (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
+		      (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
 		      recp[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
@@ -266,7 +266,7 @@ gpgme_op_encrypt (gpgme_ctx_t ctx, gpgme_key_t recp[],
       while (recp[i])
 	{
 	  TRACE_LOG3 ("recipient[%i] = %p (%s)", i, recp[i],
-		      (recp[i]->subkeys && !recp[i]->subkeys->fpr) ? 
+		      (recp[i]->subkeys && recp[i]->subkeys->fpr) ? 
 		      recp[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
diff --git a/src/export.c b/src/export.c
index 70f97284..d57dc68e 100644
--- a/src/export.c
+++ b/src/export.c
@@ -253,8 +253,8 @@ gpgme_op_export_keys_start (gpgme_ctx_t ctx,
 
       while (keys[i])
 	{
-	  TRACE_LOG3 ("keys[%i] = %p (%s)", i,keys[i],
-		      (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+	  TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
+		      (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
 		      keys[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
@@ -280,8 +280,8 @@ gpgme_op_export_keys (gpgme_ctx_t ctx,
 
       while (keys[i])
 	{
-	  TRACE_LOG3 ("keys[%i] = %p (%s)", i,keys[i],
-		      (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+	  TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
+		      (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
 		      keys[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
diff --git a/src/import.c b/src/import.c
index 1f6ece11..f4aef2f2 100644
--- a/src/import.c
+++ b/src/import.c
@@ -366,7 +366,7 @@ gpgme_op_import_keys_start (gpgme_ctx_t ctx, gpgme_key_t *keys)
       while (keys[i])
 	{
 	  TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
-		      (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+		      (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
 		      keys[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
@@ -400,7 +400,7 @@ gpgme_op_import_keys (gpgme_ctx_t ctx, gpgme_key_t *keys)
       while (keys[i])
 	{
 	  TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i],
-		      (keys[i]->subkeys && !keys[i]->subkeys->fpr) ? 
+		      (keys[i]->subkeys && keys[i]->subkeys->fpr) ? 
 		      keys[i]->subkeys->fpr : "invalid");
 	  i++;
 	}
diff --git a/src/keylist.c b/src/keylist.c
index e344b313..424a8654 100644
--- a/src/keylist.c
+++ b/src/keylist.c
@@ -965,7 +965,7 @@ gpgme_op_keylist_next (gpgme_ctx_t ctx, gpgme_key_t *r_key)
   free (queue_item);
 
   return TRACE_SUC2 ("key=%p (%s)", *r_key,
-		     ((*r_key)->subkeys && !(*r_key)->subkeys->fpr) ? 
+		     ((*r_key)->subkeys && (*r_key)->subkeys->fpr) ? 
 		     (*r_key)->subkeys->fpr : "invalid");
 }
 
@@ -1060,7 +1060,7 @@ gpgme_get_key (gpgme_ctx_t ctx, const char *fpr, gpgme_key_t *r_key,
   if (! err)
     {
       TRACE_LOG2 ("key=%p (%s)", *r_key,
-		  ((*r_key)->subkeys && !(*r_key)->subkeys->fpr) ? 
+		  ((*r_key)->subkeys && (*r_key)->subkeys->fpr) ? 
 		  (*r_key)->subkeys->fpr : "invalid");
     }
   return TRACE_ERR (err);
diff --git a/src/signers.c b/src/signers.c
index da7d3196..9eb4e4e7 100644
--- a/src/signers.c
+++ b/src/signers.c
@@ -59,7 +59,7 @@ gpgme_error_t
 gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key)
 {
   TRACE_BEG2 (DEBUG_CTX, "gpgme_signers_add", ctx,
-	      "key=%p (%s)", key, (key->subkeys && !key->subkeys->fpr) ? 
+	      "key=%p (%s)", key, (key->subkeys && key->subkeys->fpr) ? 
 	      key->subkeys->fpr : "invalid");
 
   if (!ctx || !key)