[Gpa-commits] r899 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-06-26 14:48:53 +0200 (Thu, 26 Jun 2008)
New Revision: 899

Modified:
   trunk/src/ChangeLog
   trunk/src/gpagenkeyadvop.c
Log:
Fix segv.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-06-05 14:43:02 UTC (rev 898)
+++ trunk/src/ChangeLog	2008-06-26 12:48:53 UTC (rev 899)
@@ -1,3 +1,8 @@
+2008-06-26  Werner Koch  <wk at g10code.com>
+
+	* gpagenkeyadvop.c (gpa_gen_key_advanced_operation_idle_cb): Do
+	not generate a key after cancel. Fixes a segv.
+
 2008-06-05  Werner Koch  <wk at g10code.com>
 
 	* gpastreamverifyop.c (done_cb): Take care not to write a SIGSTATUS

Modified: trunk/src/gpagenkeyadvop.c
===================================================================
--- trunk/src/gpagenkeyadvop.c	2008-06-05 14:43:02 UTC (rev 898)
+++ trunk/src/gpagenkeyadvop.c	2008-06-26 12:48:53 UTC (rev 899)
@@ -152,18 +152,20 @@
   gpg_error_t err;
   GPAKeyGenParameters *parms;
   
-  if (! (parms = gpa_key_gen_run_dialog (GPA_OPERATION (op)->window)))
+  parms = gpa_key_gen_run_dialog (GPA_OPERATION (op)->window);
+  if (!parms)
     g_signal_emit_by_name (op, "completed", gpg_error (GPG_ERR_CANCELED));
-
-  err = gpa_generate_key_start (GPA_OPERATION (op)->context->ctx, parms);
-  if (err)
+  else
     {
-      gpa_gpgme_warning (err);
-      g_signal_emit_by_name (op, "completed", err);
+      err = gpa_generate_key_start (GPA_OPERATION (op)->context->ctx, parms);
+      if (err)
+        {
+          gpa_gpgme_warning (err);
+          g_signal_emit_by_name (op, "completed", err);
+        }
+      else
+        gtk_widget_show_all (op->progress_dialog);
     }
-  else
-    gtk_widget_show_all (op->progress_dialog);
-
   return FALSE;
 }