From: Marcus Brinkmann <mb@g10code.com>
Date: Tue, 10 Nov 2009 18:05:04 +0000 (+0000)
Subject: 2009-11-10  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.3.0~18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aff1ed3fb611e34e257c677fa7d0203fa9dd6f62;p=gpgme.git

2009-11-10  Marcus Brinkmann  <marcus@g10code.de>

	* op-support.c (_gpgme_op_reset): Instead of last change, only set
	sub protocol if it is not the default.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 31cd1b0..d7af1d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-10  Marcus Brinkmann  <marcus@g10code.de>
+
+	* op-support.c (_gpgme_op_reset): Instead of last change, only set
+	sub protocol if it is not the default.
+
 2009-11-10  Werner Koch  <wk@g10code.com>
 
 	* op-support.c (_gpgme_op_reset): Ignore GPG_ERR_NOT_IMPLEMENTED
diff --git a/src/op-support.c b/src/op-support.c
index df54fc4..b3cf55e 100644
--- a/src/op-support.c
+++ b/src/op-support.c
@@ -130,11 +130,12 @@ _gpgme_op_reset (gpgme_ctx_t ctx, int type)
         }
     }
 
-  err = _gpgme_engine_set_protocol (ctx->engine, ctx->sub_protocol);
-  if (gpg_err_code (err) == GPG_ERR_NOT_IMPLEMENTED)
-    err = 0;
-  if (err)
-    return err;
+  if (ctx->sub_protocol != GPGME_PROTOCOL_DEFAULT)
+    {
+      err = _gpgme_engine_set_protocol (ctx->engine, ctx->sub_protocol);
+      if (err)
+	return err;
+    }
 
   if (type == 1 || (type == 2 && !ctx->io_cbs.add))
     {