[seahorse] Revoking subkey now works again. Also minor documentation changes.

[Pablo Castellano <pablog src gnome org>]

commit ef5874328c8a3155e8f38be3ec396f9583b9ba1b
Author: Pablo Castellano <pablog src gnome org>
Date:   Sat Feb 20 18:14:34 2010 +0100

    Revoking subkey now works again. Also minor documentation changes.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=592956

 libseahorse/seahorse-util.c |    6 +++---
 pgp/seahorse-gpgme-key-op.c |   14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/libseahorse/seahorse-util.c b/libseahorse/seahorse-util.c
index 87ee56f..6ee00e7 100644
--- a/libseahorse/seahorse-util.c
+++ b/libseahorse/seahorse-util.c
@@ -427,7 +427,7 @@ seahorse_util_memory_output_length (GMemoryOutputStream *output)
 }
 
 /** 
- * seahorse_util_printf_fd:
+ * seahorse_util_print_fd:
  * @fd: The file descriptor to write to
  * @s:  The data to write
  *
@@ -456,14 +456,14 @@ seahorse_util_print_fd (int fd, const char* s)
             l -= r;
         }
     }
-    
+
     return TRUE;
 }
 
 /** 
  * seahorse_util_printf_fd:
  * @fd: The file descriptor to write to
- * @data: The printf format of the data to write
+ * @fmt: The printf format of the data to write
  * @...: The parameters to insert
  *
  * Returns: TRUE on success, FALSE on error
diff --git a/pgp/seahorse-gpgme-key-op.c b/pgp/seahorse-gpgme-key-op.c
index ea40597..babc3d4 100644
--- a/pgp/seahorse-gpgme-key-op.c
+++ b/pgp/seahorse-gpgme-key-op.c
@@ -1707,11 +1707,10 @@ rev_subkey_action (guint state, gpointer data, int fd)
             PRINTF ((fd, "%d", parm->reason));
 			break;
 		case REV_SUBKEY_DESCRIPTION:
-            PRINTF ((fd, "%s\n", parm->description));
+            PRINTF ((fd, "%s", parm->description));
 			break;
-		/* Need empty line */
 		case REV_SUBKEY_ENDDESC:
-            PRINT ((fd, "\n"));
+            /* Need empty line, which is written at the end */
 			break;
 		case REV_SUBKEY_QUIT:
             PRINT ((fd, QUIT));
@@ -1730,7 +1729,7 @@ rev_subkey_transit (guint current_state, gpgme_status_code_t status,
 		    const gchar *args, gpointer data, gpgme_error_t *err)
 {
 	guint next_state;
-	
+
 	switch (current_state) {
 		/* start, select key */
 		case REV_SUBKEY_START:
@@ -1794,7 +1793,12 @@ rev_subkey_transit (guint current_state, gpgme_status_code_t status,
 			break;
 		/* ended description, confirm */
 		case REV_SUBKEY_ENDDESC:
-			next_state = REV_SUBKEY_CONFIRM;
+			if (status == GPGME_STATUS_GET_BOOL && g_str_equal (args, "ask_revocation_reason.okay"))
+				next_state = REV_SUBKEY_CONFIRM;
+			else {
+                *err = GPG_E (GPG_ERR_GENERAL);
+                g_return_val_if_reached (REV_SUBKEY_ERROR);
+			}
 			break;
 		/* quit, confirm(=save) */
 		case REV_SUBKEY_QUIT: