2003-02-18 Marcus Brinkmann <marcus@g10code.de>

	* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Call
	gpgsm_assuan_simple_command with status handlers.
	* edit.c (_gpgme_op_edit_start): Check return value of
	_gpgme_engine_op_edit.
	* import.c (_gpgme_op_import_start): Likewise for
	_gpgme_engine_op_import.
	* sign.c (_gpgme_op_sign_start): Likewise for
	_gpgme_engine_op_sign.

diff --git a/branches/gpgme-0-3-branch/gpgme/ChangeLog b/branches/gpgme-0-3-branch/gpgme/ChangeLog
index 935c6395f00c6e42b4c7e0f09b05e274e3093dae..abd0dbbfa3f26c54319ba9302c47fc4b230fec16 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/ChangeLog
+++ b/branches/gpgme-0-3-branch/gpgme/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-18  Marcus Brinkmann  <marcus@g10code.de>
+
+       * engine-gpgsm.c (_gpgme_gpgsm_op_sign): Call
+       gpgsm_assuan_simple_command with status handlers.
+       * edit.c (_gpgme_op_edit_start): Check return value of
+       _gpgme_engine_op_edit.
+       * import.c (_gpgme_op_import_start): Likewise for
+       _gpgme_engine_op_import.
+       * sign.c (_gpgme_op_sign_start): Likewise for
+       _gpgme_engine_op_sign.
+
 2003-01-30  Marcus Brinkmann  <marcus@g10code.de>
 
        * edit.c (_gpgme_edit_status_handler): Call the progress status

diff --git a/branches/gpgme-0-3-branch/gpgme/edit.c b/branches/gpgme-0-3-branch/gpgme/edit.c
index afc0a355ecb3f08b4482459babb07de02808043c..19cbce6c64885418297743f4bb628d2aacdfbbbd 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/edit.c
+++ b/branches/gpgme-0-3-branch/gpgme/edit.c
@@ -112,10 +112,11 @@ _gpgme_op_edit_start (GpgmeCtx ctx, int synchronous,
 
   _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
-  _gpgme_engine_op_edit (ctx->engine, key, out, ctx);
+  err = _gpgme_engine_op_edit (ctx->engine, key, out, ctx);
 
   /* And kick off the process.  */
-  err = _gpgme_engine_start (ctx->engine, ctx);
+  if (!err)
+    err = _gpgme_engine_start (ctx->engine, ctx);
   
  leave:
   if (err)

diff --git a/branches/gpgme-0-3-branch/gpgme/engine-gpgsm.c b/branches/gpgme-0-3-branch/gpgme/engine-gpgsm.c
index 41e63f5779bd0c419c8f46faf823b4bcb167a787..8e66ba84c4fff4f8ed5fa6ccee04114b42e90bea 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/engine-gpgsm.c
+++ b/branches/gpgme-0-3-branch/gpgme/engine-gpgsm.c
@@ -1138,7 +1138,8 @@ _gpgme_gpgsm_op_sign (GpgsmObject gpgsm, GpgmeData in, GpgmeData out,
 
           strcpy (stpcpy (buf, "SIGNER "), s);
           err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, buf,
-                                             NULL, NULL);
+                                             gpgsm->status.fnc,
+                                            gpgsm->status.fnc_value);
        }
       else
         err = GPGME_Invalid_Key;

diff --git a/branches/gpgme-0-3-branch/gpgme/import.c b/branches/gpgme-0-3-branch/gpgme/import.c
index f522c957f6197d0f9c065fe6dd71e11b1dc993b4..55b69eac15adce6b3308dfb14ecab811256e1b64 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/import.c
+++ b/branches/gpgme-0-3-branch/gpgme/import.c
@@ -196,7 +196,7 @@ _gpgme_op_import_start (GpgmeCtx ctx, int synchronous, GpgmeData keydata)
   _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
   _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
-  _gpgme_engine_op_import (ctx->engine, keydata);
+  err = _gpgme_engine_op_import (ctx->engine, keydata);
 
   if (!err)
     err = _gpgme_engine_start (ctx->engine, ctx);

diff --git a/branches/gpgme-0-3-branch/gpgme/sign.c b/branches/gpgme-0-3-branch/gpgme/sign.c
index c077c55e223ae73ae713f78a9c3d663eb3cd3a52..9b9a6b218278c10356d01f286770d55a8c5c0e2d 100644 (file)
--- a/branches/gpgme-0-3-branch/gpgme/sign.c
+++ b/branches/gpgme-0-3-branch/gpgme/sign.c
@@ -206,12 +206,13 @@ _gpgme_op_sign_start (GpgmeCtx ctx, int synchronous,
                                    ctx);
   _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
-  _gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
-                        ctx->use_textmode, ctx->include_certs,
-                        ctx /* FIXME */);
+  err = _gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
+                              ctx->use_textmode, ctx->include_certs,
+                              ctx /* FIXME */);
 
   /* And kick off the process.  */
-  err = _gpgme_engine_start (ctx->engine, ctx);
+  if (!err)
+    err = _gpgme_engine_start (ctx->engine, ctx);
   
  leave:
   if (err)