aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-window.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e640462a2..18dd6f760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-20 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-window.c:
+
+ Show warning on mixed content in the tooltip. Bug #321508.
+
2005-12-19 Jean-François Rameau <jframeau@cvs.gnome.org>
* embed/Makefile.am:
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0a6b64e1b..eb2c4c9cc 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1459,8 +1459,13 @@ sync_tab_security (EphyTab *tab, GParamSpec *pspec, EphyWindow *window)
state = _("Broken");
stock_id = STOCK_LOCK_BROKEN;
show_lock = TRUE;
+
+ /* Change to HAVE_GECKO_1_8_1 once https://bugzilla.mozilla.org/show_bug.cgi?id=251123 is checked in there */
+#ifndef HAVE_GECKO_1_9
+ /* In Gecko 1.9, we get a useful tooltip here */
g_free (description);
description = NULL;
+#endif
break;
case EPHY_EMBED_STATE_IS_SECURE_LOW:
case EPHY_EMBED_STATE_IS_SECURE_MED: