[git] GPGME - branch, master, updated. gpgme-1.1.8-161-g1f0f033

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  1f0f033f552b5cd81f02e761a0e31eb9a2c89ab8 (commit)
      from  3a7058cade6caec7ec38ca4b2a8c1826e6df6bb1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1f0f033f552b5cd81f02e761a0e31eb9a2c89ab8
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Fri Jan 21 04:21:30 2011 +0100

    Fix gpgconf option change if not self-assigning.
    
    2011-01-21  Marcus Brinkmann  <mb at g10code.com>
    
            * engine-gpgconf.c (_gpgme_conf_opt_change): Fix the case that is
            not self-assignment.

diff --git a/src/ChangeLog b/src/ChangeLog
index f891d98..fdd3e49 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21  Marcus Brinkmann  <mb at g10code.com>
+
+	* engine-gpgconf.c (_gpgme_conf_opt_change): Fix the case that is
+	not self-assignment.
+
 2010-12-08  Werner Koch  <wk at g10code.com>
 
 	* gpgme-tool.c (strcpy_escaped_plus): New.
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index d08ed03..6807dce 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -622,7 +622,7 @@ _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset, gpgme_conf_arg_t arg)
     {
       if (opt->new_value)
 	release_arg (opt->new_value, opt->alt_type);
-     opt->new_value = NULL;
+      opt->new_value = NULL;
       opt->change_value = 0;
     }
   else
@@ -630,10 +630,8 @@ _gpgme_conf_opt_change (gpgme_conf_opt_t opt, int reset, gpgme_conf_arg_t arg)
       /* Support self-assignment, for example for adding an item to an
 	 existing list.  */
       if (opt->new_value && arg != opt->new_value)
-	{
-	  release_arg (opt->new_value, opt->alt_type);
-	  opt->new_value = arg;
-	}
+	release_arg (opt->new_value, opt->alt_type);
+      opt->new_value = arg;
       opt->change_value = 1;
     }
   return 0;

-----------------------------------------------------------------------

Summary of changes:
 src/ChangeLog        |    5 +++++
 src/engine-gpgconf.c |    8 +++-----
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org