diff options
| author | Werner Koch <[email protected]> | 2011-02-03 19:51:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-02-03 19:51:36 +0000 |
| commit | b001a8df68c8eb33abbe879f6c7fb4db4909b6f6 (patch) | |
| tree | 800d5a8dba5aeaf953c50ede3c10669b8ef48cf2 /src/engine-gpgconf.c | |
| parent | Add support for non-API GnuPG status codes. (diff) | |
| parent | Fix socket implementation on Windows. (diff) | |
| download | gpgme-b001a8df68c8eb33abbe879f6c7fb4db4909b6f6.tar.gz gpgme-b001a8df68c8eb33abbe879f6c7fb4db4909b6f6.zip | |
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpgme
Diffstat (limited to 'src/engine-gpgconf.c')
| -rw-r--r-- | src/engine-gpgconf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c index d08ed03c..6807dce9 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; |