[svn] gpgme - r1430 - trunk/src

[svn author marcus]

Author: marcus
Date: 2009-11-10 19:05:04 +0100 (Tue, 10 Nov 2009)
New Revision: 1430

Modified:
   trunk/src/ChangeLog
   trunk/src/op-support.c
Log:
2009-11-10  Marcus Brinkmann  <marcus at g10code.de>

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


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-11-10 16:32:11 UTC (rev 1429)
+++ trunk/src/ChangeLog	2009-11-10 18:05:04 UTC (rev 1430)
@@ -1,3 +1,8 @@
+2009-11-10  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* op-support.c (_gpgme_op_reset): Ignore GPG_ERR_NOT_IMPLEMENTED

Modified: trunk/src/op-support.c
===================================================================
--- trunk/src/op-support.c	2009-11-10 16:32:11 UTC (rev 1429)
+++ trunk/src/op-support.c	2009-11-10 18:05:04 UTC (rev 1430)
@@ -130,11 +130,12 @@
         }
     }
 
-  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))
     {