diff options
| author | Werner Koch <[email protected]> | 2005-01-20 11:42:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-01-20 11:42:03 +0000 |
| commit | 5bda87bd6ea9936af2abd3c449fc48dc57549c1f (patch) | |
| tree | feefe0d59cbe40eb7952b2f24a22fcf394ca8a27 /g10/gpgv.c | |
| parent | * NEWS: Note --rfc2440-text import/export-unusable-sigs and (diff) | |
| download | gnupg-5bda87bd6ea9936af2abd3c449fc48dc57549c1f.tar.gz gnupg-5bda87bd6ea9936af2abd3c449fc48dc57549c1f.zip | |
* g10.c (i18n_init) [W32]: Pass registry key to gettext
initialization.
* gpgv.c (i18n_init) [W32]: Ditto.
* simple-gettext.c (set_gettext_file): Use MO files depending on
the installation directory. Add new arg REGKEY.
Diffstat (limited to '')
| -rw-r--r-- | g10/gpgv.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index 7778953d1..020b548bb 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -1,5 +1,6 @@ /* gpgv.c - The GnuPG signature verify utility - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2005 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -112,7 +113,7 @@ static void i18n_init(void) { #ifdef USE_SIMPLE_GETTEXT - set_gettext_file( PACKAGE ); + set_gettext_file (PACKAGE, "Software\\GNU\\GnuPG"); #else #ifdef ENABLE_NLS setlocale( LC_ALL, "" ); @@ -141,14 +142,8 @@ main( int argc, char **argv ) opt.trust_model = TM_ALWAYS; opt.batch = 1; -#if defined (_WIN32) - opt.homedir = read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" ); -#else - opt.homedir = getenv("GNUPGHOME"); -#endif - if( !opt.homedir || !*opt.homedir ) { - opt.homedir = GNUPG_HOMEDIR; - } + opt.homedir = default_homedir (); + tty_no_terminal(1); tty_batchmode(1); disable_dotlock(); |