diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-01-09 09:29:17 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-01-09 09:29:17 +0800 |
| commit | 26655a0641769e2b8d27980b9dc463f5282a489c (patch) | |
| tree | bfae8f3c6f9ba51bf97711a9dff1ec8c187ecd74 | |
| parent | 2427e942801133136a6d63874eee960f1249f0d2 (diff) | |
| download | gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.tar gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.tar.gz gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.tar.bz2 gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.tar.lz gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.tar.xz gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.tar.zst gsoc2013-epiphany-26655a0641769e2b8d27980b9dc463f5282a489c.zip | |
Don't show the description for no-secure and broken sites.
2005-01-09 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-window.c: (sync_tab_security):
Don't show the description for no-secure and broken sites.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/ephy-window.c | 19 |
2 files changed, 18 insertions, 7 deletions
@@ -1,5 +1,11 @@ 2005-01-09 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-window.c: (sync_tab_security): + + Don't show the description for no-secure and broken sites. + +2005-01-09 Christian Persch <chpe@cvs.gnome.org> + * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: * embed/mozilla/GtkNSSSecurityWarningDialogs.h: 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), |