diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/engine-gpgconf.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f891d980..fdd3e496 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-01-21 Marcus Brinkmann <[email protected]> + + * engine-gpgconf.c (_gpgme_conf_opt_change): Fix the case that is + not self-assignment. + 2010-12-08 Werner Koch <[email protected]> * gpgme-tool.c (strcpy_escaped_plus): New. 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; |