aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/ephy-toolbar.c13
-rw-r--r--src/ephy-window.c2
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index 958ef9203..41368a6c4 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -448,12 +448,13 @@ ephy_toolbar_activate_location (EphyToolbar *toolbar)
entry = GTK_WIDGET (proxies->data);
}
- /* happens when the user has removed the location entry from
- * the toolbars, or when it's overflown
- * FIXME: if gtkmozembed focus is ever fixed, we want to correct this,
- * since then we want to activate the toolbar even if it's hidden.
- */
- if (entry == NULL || !GTK_WIDGET_REALIZED (entry)) return;
+ if (entry == NULL)
+ {
+ /* happens when the user has removed the location entry from
+ * the toolbars.
+ */
+ return;
+ }
g_object_get (G_OBJECT (toolbar), "visible", &visible, NULL);
if (visible == FALSE)
diff --git a/src/ephy-window.c b/src/ephy-window.c
index cd0f4f7f6..420a074c8 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -522,6 +522,8 @@ sync_chromes_visibility (EphyWindow *window)
GtkWidget *menubar;
gboolean show_statusbar, show_menubar, show_toolbar, show_bookmarksbar;
+ if (priv->closing) return;
+
get_chromes_visibility (window, &show_menubar,
&show_statusbar, &show_toolbar,
&show_bookmarksbar);