diff options
| author | Jeffrey Stedfast <fejj@novell.com> | 2006-06-26 15:34:28 +0000 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2006-06-26 15:34:28 +0000 |
| commit | 8316c2abeea69ce1737d5905ea2db22c03ee646d (patch) | |
| tree | 7ebcb83644436ea99588dfb8d263e110304b98b3 | |
| parent | 7940fb55f2ed4ff9272de6a5b2e3329034e8eff6 (diff) | |
| download | evolution-data-server-8316c2abeea69ce1737d5905ea2db22c03ee646d.tar.gz | |
Only set name to "" if it wasn't already set. Fixes bug #345965.
2006-06-26 Jeffrey Stedfast <fejj@novell.com>
* camel-gpg-context.c (gpg_ctx_parse_status): Only set name to ""
if it wasn't already set. Fixes bug #345965.
| -rw-r--r-- | camel/ChangeLog | 23 | ||||
| -rw-r--r-- | camel/camel-gpg-context.c | 4 |
2 files changed, 18 insertions, 9 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 0bbfd663f..67ae870a6 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2006-06-26 Jeffrey Stedfast <fejj@novell.com> + + * camel-gpg-context.c (gpg_ctx_parse_status): Only set name to "" + if it wasn't already set. Fixes bug #345965. + 2006-06-15 Tor Lillqvist <tml@novell.com> * camel.c (camel_init): On Win32, NSS wants the directory name in @@ -7,24 +12,28 @@ 2006-06-15 Andre Klapper <a9016009@gmx.de> - * camel-gpg-context.c: - * camel-net-utils.c: - changing "cancelled" to "canceled" in user-visible strings. - Fixes bug #342163. + * camel-gpg-context.c: + + * camel-net-utils.c: changing "cancelled" to "canceled" in + user-visible strings. Fixes bug #342163. 2006-06-15 Andre Klapper <a9016009@gmx.de> * addressbook/libebook/e-book.c: + * camel/camel-folder.c: + * camel/providers/nntp/camel-nntp-folder.c: - * camel/providers/pop3/camel-pop3-folder.c: - changing "uri" to "URI" in user-visible strings. - Fixes bug #342161. + + * camel/providers/pop3/camel-pop3-folder.c: changing "uri" to + "URI" in user-visible strings. Fixes bug #342161. 2006-06-09 Chris Heath <chris@heathens.co.nz> * camel-net-utils.c (camel_getnameinfo): Fix memory leak + * camel-folder-search.c (camel_folder_search_search): Ditto + * camel-digest-folder.c (digest_add_multipart): Ditto. Fixes bug #335423. diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index c31fab861..5bd7a3a14 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -809,15 +809,15 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex) g_free (gpg->need_id); gpg->need_id = userid; } else if (!strncmp (status, "GET_HIDDEN ", 11)) { + const char *name = NULL; char *prompt, *passwd; - const char *name; guint32 flags; status += 11; if (gpg->need_id && !(name = g_hash_table_lookup (gpg->userid_hint, gpg->need_id))) name = gpg->need_id; - else + else if (!name) name = ""; if (!strncmp (status, "passphrase.pin.ask", 18)) { |