diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 2 | ||||
| -rwxr-xr-x | src/ephy-toolbar.c | 11 |
3 files changed, 12 insertions, 7 deletions
@@ -1,5 +1,11 @@ 2005-03-11 Christian Persch <chpe@cvs.gnome.org> + * 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 <chpe@cvs.gnome.org> + * data/default-prefs-toolkit.js: Disable automatic image resizing on toolkit too. 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). @: @: @: +@: +@: @: <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### --> 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) |