diff options
| author | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
| commit | cc9a0b69b698ba436eaf777e5020532845b56236 (patch) | |
| tree | cb2274c3d97fffa7020cb1e5a56373935ee094b2 /tools/gpgconf-comp.c | |
| parent | Add strusage macro replacement feature. (diff) | |
| download | gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.tar.gz gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.zip | |
Make use of the *_NAME etc macros.
Replace hardwired strings at many places with new macros from config.h
and use the new strusage macro replacement feature.
* common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
sentinels.
* agent/command.c (cmd_import_key): Use asprintf to create the prompt.
Diffstat (limited to 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index ffe7eab09..024417ef5 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -58,7 +58,7 @@ #if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM) #define GPGNAME "gpg2" #else -#define GPGNAME "gpg" +#define GPGNAME GPG_NAME #endif @@ -180,15 +180,15 @@ static struct } gc_backend[GC_BACKEND_NR] = { { NULL }, /* GC_BACKEND_ANY dummy entry. */ - { "GnuPG", GPGNAME, GNUPG_MODULE_NAME_GPG, + { GNUPG_NAME, GPGNAME, GNUPG_MODULE_NAME_GPG, NULL, "gpgconf-gpg.conf" }, - { "GPGSM", "gpgsm", GNUPG_MODULE_NAME_GPGSM, + { "GPGSM", GPGSM_NAME, GNUPG_MODULE_NAME_GPGSM, NULL, "gpgconf-gpgsm.conf" }, - { "GPG Agent", "gpg-agent", GNUPG_MODULE_NAME_AGENT, + { "GPG Agent", GPG_AGENT_NAME, GNUPG_MODULE_NAME_AGENT, gpg_agent_runtime_change, "gpgconf-gpg-agent.conf" }, - { "SCDaemon", "scdaemon", GNUPG_MODULE_NAME_SCDAEMON, + { "SCDaemon", SCDAEMON_NAME, GNUPG_MODULE_NAME_SCDAEMON, scdaemon_runtime_change, "gpgconf-scdaemon.conf" }, - { "DirMngr", "dirmngr", GNUPG_MODULE_NAME_DIRMNGR, + { "DirMngr", DIRMNGR_NAME, GNUPG_MODULE_NAME_DIRMNGR, NULL, "gpgconf-dirmngr.conf" }, { "DirMngr LDAP Server List", NULL, 0, NULL, "ldapserverlist-file", "LDAP Server" }, @@ -1215,8 +1215,8 @@ my_dgettext (const char *domain, const char *msgid) switched_codeset = 1; bind_textdomain_codeset (PACKAGE_GT, "utf-8"); - bindtextdomain ("dirmngr", LOCALEDIR); - bind_textdomain_codeset ("dirmngr", "utf-8"); + bindtextdomain (DIRMNGR_NAME, LOCALEDIR); + bind_textdomain_codeset (DIRMNGR_NAME, "utf-8"); } |