[Gpa-commits] r747 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-03-03 15:01:14 +0100 (Fri, 03 Mar 2006)
New Revision: 747

Modified:
   trunk/TODO
   trunk/src/ChangeLog
   trunk/src/gpafileverifyop.c
Log:
2006-03-03  Marcus Brinkmann  <marcus at g10code.de>

	* gpafileverifyop.c: Revert last change, it broke verification of
	non-encrypted files.  Instead, the decryption operation has to
	show the signatures, but that is a bigger change.


Modified: trunk/TODO
===================================================================
--- trunk/TODO	2006-03-03 13:34:04 UTC (rev 746)
+++ trunk/TODO	2006-03-03 14:01:14 UTC (rev 747)
@@ -14,6 +14,8 @@
    file" radio button automatically, or disable the file entry unless it's
    checked.
 
+* The file decrypt operation should also show signatures, if available.
+
 * Context menus.
 
 * Add more options to the "Edit key" dialog.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-03-03 13:34:04 UTC (rev 746)
+++ trunk/src/ChangeLog	2006-03-03 14:01:14 UTC (rev 747)
@@ -1,3 +1,9 @@
+2006-03-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpafileverifyop.c: Revert last change, it broke verification of
+	non-encrypted files.  Instead, the decryption operation has to
+	show the signatures, but that is a bigger change.
+	
 2006-02-28  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpafileverifyop.c (gpa_file_verify_operation_start): Use

Modified: trunk/src/gpafileverifyop.c
===================================================================
--- trunk/src/gpafileverifyop.c	2006-03-03 13:34:04 UTC (rev 746)
+++ trunk/src/gpafileverifyop.c	2006-03-03 14:01:14 UTC (rev 747)
@@ -254,10 +254,6 @@
 	  return FALSE;
 	}
       op->plain = NULL;
-
-      /* Start the operation */
-      err = gpgme_op_verify_start (GPA_OPERATION (op)->context->ctx, op->sig,
-				   op->signed_text, op->plain);
     }
   else
     {
@@ -276,13 +272,11 @@
 	}
       op->signed_text_fd = -1;
       op->signed_text = NULL;
-
-      /* Start the operation */
-      err = gpgme_op_decrypt_verify_start (GPA_OPERATION (op)->context->ctx, op->sig,
-					   op->plain);
-
     }
 
+  /* Start the operation */
+  err = gpgme_op_verify_start (GPA_OPERATION (op)->context->ctx, op->sig,
+			       op->signed_text, op->plain);
   if (gpg_err_code (err) != GPG_ERR_NO_ERROR)
     {
       gpa_gpgme_warning (err);