From bc078f97a9b70df133e2303e6eacf7b31eed74d6 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Fri, 18 May 2007 23:32:51 +0000 Subject: [PATCH] 2007-05-19 Marcus Brinkmann * passphrase.c (passphrase_get): Use PACKAGE_GT, not PACKAGE. --- g10/ChangeLog | 2 ++ g10/passphrase.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index a6b6cb5b3..fb22ca0c6 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,7 @@ 2007-05-19 Marcus Brinkmann + * passphrase.c (passphrase_get): Use PACKAGE_GT, not PACKAGE. + * passphrase.c (passphrase_get): Free ORIG_CODESET on error. 2007-05-16 Werner Koch diff --git a/g10/passphrase.c b/g10/passphrase.c index 83606b8ff..970e4d9a3 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -281,7 +281,7 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, #ifdef ENABLE_NLS /* The Assuan agent protocol requires us to transmit utf-8 strings */ - orig_codeset = bind_textdomain_codeset (PACKAGE, NULL); + orig_codeset = bind_textdomain_codeset (PACKAGE_GT, NULL); #ifdef HAVE_LANGINFO_CODESET if (!orig_codeset) orig_codeset = nl_langinfo (CODESET); @@ -396,7 +396,7 @@ passphrase_get ( u32 *keyid, int mode, const char *cacheid, #ifdef ENABLE_NLS if (orig_codeset) { - bind_textdomain_codeset (PACKAGE, orig_codeset); + bind_textdomain_codeset (PACKAGE_GT, orig_codeset); xfree (orig_codeset); } #endif