diff options
| author | Werner Koch <wk@gnupg.org> | 2005-01-20 12:42:03 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2005-01-20 12:42:03 +0100 |
| commit | 5bda87bd6ea9936af2abd3c449fc48dc57549c1f (patch) | |
| tree | feefe0d59cbe40eb7952b2f24a22fcf394ca8a27 /g10/g10.c | |
| parent | * NEWS: Note --rfc2440-text import/export-unusable-sigs and (diff) | |
| download | gnupg2-5bda87bd6ea9936af2abd3c449fc48dc57549c1f.tar.xz gnupg2-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 'g10/g10.c')
| -rw-r--r-- | g10/g10.c | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -1,6 +1,6 @@ /* g10.c - The GnuPG utility (main for gpg) * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 - * 2004 Free Software Foundation, Inc. + * 2004, 2005 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -839,7 +839,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, "" ); @@ -1673,14 +1673,7 @@ main( int argc, char **argv ) set_screen_dimensions(); opt.keyid_format=KF_SHORT; opt.rfc2440_text=1; -#if defined (_WIN32) - set_homedir ( read_w32_registry_string( NULL, - "Software\\GNU\\GnuPG", "HomeDir" )); -#else - set_homedir ( getenv("GNUPGHOME") ); -#endif - if( !*opt.homedir ) - set_homedir ( GNUPG_HOMEDIR ); + set_homedir ( default_homedir () ); #ifdef ENABLE_CARD_SUPPORT # ifdef _WIN32 |