diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 3 | ||||
| -rw-r--r-- | g10/getkey.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 95b6a8683..2495f05a2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2001-04-24 Werner Koch <[email protected]> + * getkey.c (get_primary_uid): Return a different string in case of + error and made it translatable. + * build-packet.c (do_secret_key): Ugly, we wrote a zero instead of the calucalted ndays. Thanks to M Taylor for complaining about a secret key import problem. diff --git a/g10/getkey.c b/g10/getkey.c index f61482118..b70918352 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -235,6 +235,7 @@ static const char * get_primary_uid ( KBNODE keyblock, size_t *uidlen ) { KBNODE k; + const char *s; for (k=keyblock; k; k=k->next ) { if ( k->pkt->pkttype == PKT_USER_ID @@ -243,8 +244,11 @@ get_primary_uid ( KBNODE keyblock, size_t *uidlen ) return k->pkt->pkt.user_id->name; } } - *uidlen = 12; - return "[No user ID]"; + /* fixme: returning translatable constants instead of a user ID is + * not good because they are probably not utf-8 encoded. */ + s = _("[User id not found]"); + *uidlen = strlen (s); + return s; } |