aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-03-12 04:32:12 +0800
committerChristian Persch <chpe@src.gnome.org>2005-03-12 04:32:12 +0800
commit5e41bc513f3dddaf7edd80589c6de1af404897d3 (patch)
treefb01d0c7f1a16da603b103884001d15830e6da43
parent4ae4a46a1b7802a5e537284e0a325e7335fb56d6 (diff)
downloadgsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.tar
gsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.tar.gz
gsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.tar.bz2
gsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.tar.lz
gsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.tar.xz
gsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.tar.zst
gsoc2013-epiphany-5e41bc513f3dddaf7edd80589c6de1af404897d3.zip
Don't activate the location entry if it's hidden. Fixes bug #169956.
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.
-rw-r--r--ChangeLog6
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml2
-rwxr-xr-xsrc/ephy-toolbar.c11
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b32307a63..6a169c5bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)