From 26655a0641769e2b8d27980b9dc463f5282a489c Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 9 Jan 2005 01:29:17 +0000 Subject: Don't show the description for no-secure and broken sites. 2005-01-09 Christian Persch * src/ephy-window.c: (sync_tab_security): Don't show the description for no-secure and broken sites. --- ChangeLog | 6 ++++++ src/ephy-window.c | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcd7a5de5..f5a06d02c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-01-09 Christian Persch + + * src/ephy-window.c: (sync_tab_security): + + Don't show the description for no-secure and broken sites. + 2005-01-09 Christian Persch * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: diff --git a/src/ephy-window.c b/src/ephy-window.c index 7d189be8f..68b99eabc 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1367,14 +1367,21 @@ sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window) break; case EPHY_EMBED_STATE_IS_INSECURE: state = _("Insecure"); + g_free (description); + description = NULL; break; case EPHY_EMBED_STATE_IS_BROKEN: state = _("Broken"); stock_id = STOCK_LOCK_BROKEN; + g_free (description); + description = NULL; break; case EPHY_EMBED_STATE_IS_SECURE_LOW: case EPHY_EMBED_STATE_IS_SECURE_MED: state = _("Low"); + /* We deliberately don't show the 'secure' icon + * for low & medium secure sites; see bug #151709. + */ stock_id = STOCK_LOCK_INSECURE; break; case EPHY_EMBED_STATE_IS_SECURE_HIGH: @@ -1386,16 +1393,14 @@ sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window) break; } + tooltip = g_strdup_printf (_("Security level: %s"), state); if (description != NULL) { - tooltip = g_strdup_printf (_("Security level: %s\n%s"), - state, description); - g_free (description); - } - else - { - tooltip = g_strdup_printf (_("Security level: %s"), state); + char *tmp = tooltip; + tooltip = g_strconcat (tmp, "\n", description, NULL); + g_free (description); + g_free (tmp); } ephy_statusbar_set_security_state (EPHY_STATUSBAR (window->priv->statusbar), -- cgit v1.2.3