diff options
| author | David Shaw <[email protected]> | 2004-08-23 17:55:49 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-08-23 17:55:49 +0000 |
| commit | 9d4327ba4dc26fb33531ffecf07f673ba65d0637 (patch) | |
| tree | 93cb24c58557a8461ccd2c1fae8b0943f99c04c1 /g10/import.c | |
| parent | * gpgkeys_hkp.c (dehtmlize): Understand the quote character (i.e. (diff) | |
| download | gnupg-9d4327ba4dc26fb33531ffecf07f673ba65d0637.tar.gz gnupg-9d4327ba4dc26fb33531ffecf07f673ba65d0637.zip | |
* keydb.h, getkey.c (get_user_id_printable): Rename to get_user_id_native
and remove the printable stuff since we're print-ifying valid utf8
characters. Change all callers in import.c, sign.c, keylist.c, and
encode.c.
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/import.c b/g10/import.c index 40ab7f296..a718e91d1 100644 --- a/g10/import.c +++ b/g10/import.c @@ -1,5 +1,5 @@ /* import.c - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. @@ -781,7 +781,7 @@ import_one( const char *fname, KBNODE keyblock, /* we are ready */ if( !opt.quiet ) { - char *p=get_user_id_printable (keyid); + char *p=get_user_id_native (keyid); log_info( _("key %s: public key \"%s\" imported\n"), keystr(keyid),p); m_free(p); @@ -861,7 +861,7 @@ import_one( const char *fname, KBNODE keyblock, /* we are ready */ if( !opt.quiet ) { - char *p=get_user_id_printable(keyid); + char *p=get_user_id_native(keyid); if( n_uids == 1 ) log_info( _("key %s: \"%s\" 1 new user ID\n"), keystr(keyid),p); @@ -898,7 +898,7 @@ import_one( const char *fname, KBNODE keyblock, if( !opt.quiet ) { - char *p=get_user_id_printable(keyid); + char *p=get_user_id_native(keyid); log_info( _("key %s: \"%s\" not changed\n"),keystr(keyid),p); m_free(p); } @@ -1215,7 +1215,7 @@ import_revoke_cert( const char *fname, KBNODE node, struct stats_s *stats ) /* we are ready */ if( !opt.quiet ) { - char *p=get_user_id_printable (keyid); + char *p=get_user_id_native (keyid); log_info( _("key %s: \"%s\" revocation certificate imported\n"), keystr(keyid),p); m_free(p); @@ -1766,7 +1766,7 @@ merge_blocks( const char *fname, KBNODE keyblock_orig, KBNODE keyblock, ++*n_sigs; if(!opt.quiet) { - char *p=get_user_id_printable (keyid); + char *p=get_user_id_native (keyid); log_info(_("key %s: \"%s\" revocation" " certificate added\n"), keystr(keyid),p); m_free(p); |