diff options
| author | Marcus Brinkmann <[email protected]> | 2011-01-21 03:21:30 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-01-21 03:21:30 +0000 |
| commit | 1f0f033f552b5cd81f02e761a0e31eb9a2c89ab8 (patch) | |
| tree | 45f55d7cc58cdeea3920c7c5eb2120c8045ab330 | |
| parent | Typo fixes spotted by Daiki Ueno. (diff) | |
| download | gpgme-1f0f033f552b5cd81f02e761a0e31eb9a2c89ab8.tar.gz gpgme-1f0f033f552b5cd81f02e761a0e31eb9a2c89ab8.zip | |
Fix gpgconf option change if not self-assigning.
2011-01-21 Marcus Brinkmann <[email protected]>
* engine-gpgconf.c (_gpgme_conf_opt_change): Fix the case that is
not self-assignment.
| -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; |