From cd6b8c0139d7bf38ffd48c887031cf8a3aa1c0d5 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 10 Dec 2003 02:25:31 +0000 Subject: if we get no matching certs, show empty menu rather than crashing. #51922. 2003-12-10 Not Zed * gui/e-cert-selector.c (e_cert_selector_new): if we get no matching certs, show empty menu rather than crashing. #51922. svn path=/trunk/; revision=23898 --- smime/gui/e-cert-selector.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'smime/gui') diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index b3fcabdc43..9c64ebb37e 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -176,19 +176,21 @@ e_cert_selector_new(int type, const char *currentid) certlist = CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(), usage, FALSE, TRUE, NULL); ecs->priv->certlist = certlist; - node = CERT_LIST_HEAD(certlist); - while (!CERT_LIST_END(node, certlist)) { - w = gtk_menu_item_new_with_label(node->cert->nickname); - gtk_menu_shell_append((GtkMenuShell *)menu, w); - gtk_widget_show(w); - - if (currentid != NULL - && (strcmp(node->cert->nickname, currentid) == 0 - || strcmp(node->cert->emailAddr, currentid) == 0)) - active = n; - - n++; - node = CERT_LIST_NEXT(node); + if (certlist != NULL) { + node = CERT_LIST_HEAD(certlist); + while (!CERT_LIST_END(node, certlist)) { + w = gtk_menu_item_new_with_label(node->cert->nickname); + gtk_menu_shell_append((GtkMenuShell *)menu, w); + gtk_widget_show(w); + + if (currentid != NULL + && (strcmp(node->cert->nickname, currentid) == 0 + || strcmp(node->cert->emailAddr, currentid) == 0)) + active = n; + + n++; + node = CERT_LIST_NEXT(node); + } } gtk_option_menu_set_menu((GtkOptionMenu *)p->menu, menu); -- cgit v1.2.3