Revert patch from bug #169956, it's not correct.

2005-03-11  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-toolbar.c: (ephy_toolbar_activate_location):

	Revert patch from bug #169956, it's not correct.

	* src/ephy-window.c: (sync_chromes_visibility):

	Fix a crash on window close with active toolbar activation.

3 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a169c5bc..1a479f173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
 	* src/ephy-toolbar.c: (ephy_toolbar_activate_location):
 
+	Revert patch from bug #169956, it's not correct.
+
+	* src/ephy-window.c: (sync_chromes_visibility):
+
+	Fix a crash on window close with active toolbar activation.
+
+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>
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);