[Gpa-commits] r885 - trunk/src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue May 6 18:13:34 CEST 2008
Author: marcus
Date: 2008-05-06 18:13:33 +0200 (Tue, 06 May 2008)
New Revision: 885
Modified:
trunk/src/ChangeLog
trunk/src/gpakeydeleteop.c
trunk/src/gpakeyexpireop.c
trunk/src/gpakeypasswdop.c
trunk/src/gpakeysignop.c
trunk/src/gpakeytrustop.c
Log:
2008-05-06 Marcus Brinkmann <marcus at ulysses.g10code.com>
* gpakeydeleteop.c (gpa_key_delete_operation_next), gpakeysignop.c
(gpa_key_sign_operation_next), gpakeypasswdop.c
(gpa_key_passwd_operation_next), gpakeyexpireop.c
(gpa_key_expire_operation_next), gpakeytrustop.c
(gpa_key_trust_operation_next): Fix last change.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2008-05-06 14:00:54 UTC (rev 884)
+++ trunk/src/ChangeLog 2008-05-06 16:13:33 UTC (rev 885)
@@ -1,3 +1,11 @@
+2008-05-06 Marcus Brinkmann <marcus at ulysses.g10code.com>
+
+ * gpakeydeleteop.c (gpa_key_delete_operation_next), gpakeysignop.c
+ (gpa_key_sign_operation_next), gpakeypasswdop.c
+ (gpa_key_passwd_operation_next), gpakeyexpireop.c
+ (gpa_key_expire_operation_next), gpakeytrustop.c
+ (gpa_key_trust_operation_next): Fix last change.
+
2008-05-06 Marcus Brinkmann <marcus at g10code.de>
* filesigndlg.c (gpa_file_sign_dialog_constructor): Fix
Modified: trunk/src/gpakeydeleteop.c
===================================================================
--- trunk/src/gpakeydeleteop.c 2008-05-06 14:00:54 UTC (rev 884)
+++ trunk/src/gpakeydeleteop.c 2008-05-06 16:13:33 UTC (rev 885)
@@ -182,15 +182,15 @@
{
gpg_error_t err;
- if (! GPA_KEY_OPERATION (op)->current)
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", 0);
-
- err = gpa_key_delete_operation_start (op);
- if (err)
+ if (GPA_KEY_OPERATION (op)->current)
{
- g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
+ err = gpa_key_delete_operation_start (op);
+ if (! err)
+ return;
}
+
+ g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
+ g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
static void gpa_key_delete_operation_done_error_cb (GpaContext *context,
Modified: trunk/src/gpakeyexpireop.c
===================================================================
--- trunk/src/gpakeyexpireop.c 2008-05-06 14:00:54 UTC (rev 884)
+++ trunk/src/gpakeyexpireop.c 2008-05-06 16:13:33 UTC (rev 885)
@@ -208,20 +208,21 @@
static void
gpa_key_expire_operation_next (GpaKeyExpireOperation *op)
{
- gpg_error_t err;
+ gpg_error_t err = 0;
- if (! GPA_KEY_OPERATION (op)->current)
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", 0);
-
- err = gpa_key_expire_operation_start (op);
- if (err)
+ if (GPA_KEY_OPERATION (op)->current)
{
- if (op->modified_keys > 0)
- g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
+ err = gpa_key_expire_operation_start (op);
+ if (! err)
+ return;
}
+
+ if (op->modified_keys > 0)
+ g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
+ g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
+
static void
gpa_key_expire_operation_done_error_cb (GpaContext *context,
gpg_error_t err,
Modified: trunk/src/gpakeypasswdop.c
===================================================================
--- trunk/src/gpakeypasswdop.c 2008-05-06 14:00:54 UTC (rev 884)
+++ trunk/src/gpakeypasswdop.c 2008-05-06 16:13:33 UTC (rev 885)
@@ -181,14 +181,16 @@
static void
gpa_key_passwd_operation_next (GpaKeyPasswdOperation *op)
{
- gpg_error_t err;
+ gpg_error_t err = 0;
- if (! GPA_KEY_OPERATION (op)->current)
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", 0);
+ if (GPA_KEY_OPERATION (op)->current)
+ {
+ err = gpa_key_passwd_operation_start (op);
+ if (! err)
+ return;
+ }
- err = gpa_key_passwd_operation_start (op);
- if (err)
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
+ g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
Modified: trunk/src/gpakeysignop.c
===================================================================
--- trunk/src/gpakeysignop.c 2008-05-06 14:00:54 UTC (rev 884)
+++ trunk/src/gpakeysignop.c 2008-05-06 16:13:33 UTC (rev 885)
@@ -205,18 +205,18 @@
static void
gpa_key_sign_operation_next (GpaKeySignOperation *op)
{
- gpg_error_t err;
+ gpg_error_t err = 0;
- if (! GPA_KEY_OPERATION (op)->current)
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", 0);
-
- err = gpa_key_sign_operation_start (op);
- if (err)
+ if (GPA_KEY_OPERATION (op)->current)
{
- if (op->signed_keys > 0)
- g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
+ err = gpa_key_sign_operation_start (op);
+ if (! err)
+ return;
}
+
+ if (op->signed_keys > 0)
+ g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
+ g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
Modified: trunk/src/gpakeytrustop.c
===================================================================
--- trunk/src/gpakeytrustop.c 2008-05-06 14:00:54 UTC (rev 884)
+++ trunk/src/gpakeytrustop.c 2008-05-06 16:13:33 UTC (rev 885)
@@ -186,18 +186,18 @@
static void
gpa_key_trust_operation_next (GpaKeyTrustOperation *op)
{
- gpg_error_t err;
+ gpg_error_t err = 0;
- if (! GPA_KEY_OPERATION (op)->current)
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", 0);
+ if (GPA_KEY_OPERATION (op)->current)
+ {
+ err = gpa_key_trust_operation_start (op);
+ if (! err)
+ return;
+ }
- err = gpa_key_trust_operation_start (op);
- if (err)
- {
- if (op->modified_keys > 0)
- g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
- g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
- }
+ if (op->modified_keys > 0)
+ g_signal_emit_by_name (GPA_OPERATION (op), "changed_wot");
+ g_signal_emit_by_name (GPA_OPERATION (op), "completed", err);
}
More information about the Gpa-commits
mailing list