From 5e41bc513f3dddaf7edd80589c6de1af404897d3 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Fri, 11 Mar 2005 20:32:12 +0000 Subject: Don't activate the location entry if it's hidden. Fixes bug #169956. 2005-03-11 Christian Persch * src/ephy-toolbar.c: (ephy_toolbar_activate_location): Don't activate the location entry if it's hidden. Fixes bug #169956. --- ChangeLog | 6 ++++++ doc/reference/tmpl/ephy-embed.sgml | 2 ++ src/ephy-toolbar.c | 11 ++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b32307a63..6a169c5bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-03-11 Christian Persch + + * src/ephy-toolbar.c: (ephy_toolbar_activate_location): + + Don't activate the location entry if it's hidden. Fixes bug #169956. + 2005-03-11 Christian Persch * data/default-prefs-toolkit.js: diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index 75abf2835..c86b65f81 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -225,6 +225,8 @@ be done by casting). @: @: @: +@: +@: @: diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index 41368a6c4..e9468e481 100755 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -448,13 +448,10 @@ ephy_toolbar_activate_location (EphyToolbar *toolbar) entry = GTK_WIDGET (proxies->data); } - if (entry == NULL) - { - /* happens when the user has removed the location entry from - * the toolbars. - */ - return; - } + /* happens when the user has removed the location entry from + * the toolbars, or when it's overflown + */ + if (entry == NULL || !GTK_WIDGET_REALIZED (entry)) return; g_object_get (G_OBJECT (toolbar), "visible", &visible, NULL); if (visible == FALSE) -- cgit v1.2.3