security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

See ChangeLog

Browse source
This commit is contained in:
Werner Koch 2006-04-08 00:36:51 +00:00
parent 4af2725d32
commit e5a03c84f7
7 changed files with 83 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
g10/ChangeLog
View file

@ -1,3 +1,9 @@
2006-04-05 Werner Koch <wk@g10code.com>
* getkey.c (user_id_not_found_utf8): New.
(get_primary_uid, get_user_id): Use it. Fixes Debian bug #205028
inthe right way.
2006-04-03 Werner Koch <wk@g10code.com>
* import.c (check_prefs_warning): Merged strings for better

21
g10/getkey.c
View file

@ -163,6 +163,21 @@ cache_public_key( PKT_public_key *pk )
}
/* Return a const utf-8 string with the text "[User ID not found]".
This fucntion is required so that we don't need to switch gettext's
encoding temporary. */
static const char *
user_id_not_found_utf8 (void)
{
static char *text;
if (!text)
text = native_to_utf8 (_("[User ID not found]"));
return text;
}
/*
* Return the user ID from the given keyblock.
* We use the primary uid flag which has been set by the merge_selfsigs
@ -183,9 +198,7 @@ get_primary_uid ( KBNODE keyblock, size_t *uidlen )
return k->pkt->pkt.user_id->name;
}
}
/* 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]");
s = user_id_not_found_utf8 ();
*uidlen = strlen (s);
return s;
}
@ -2886,7 +2899,7 @@ get_user_id( u32 *keyid, size_t *rn )
}
}
} while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
p = xstrdup( _("[User ID not found]") );
p = xstrdup( user_id_not_found_utf8 () );
*rn = strlen(p);
return p;
}