2003-08-02 Christian Persch

	* src/ephy-encodings-menu.c: (build_group):

	Fix ui xml string.

	* src/ephy-tabs-menu.c: (ephy_tabs_menu_update):

	Fix mem leak.

	* src/ephy-window.c: (remove_from_session), (ephy_window_destroy),
	(ephy_window_finalize):
	* src/session.h:
	* src/session.c: (session_class_init), (session_remove_window):

	Move up the removal of the window from the session to when it's still
	valid and non-finalised. Include the window as parameter in the
	close signal of the session.

1 files changed, 17 insertions, 14 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 1f58e3bb3..8195b3135 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -332,13 +332,29 @@ ephy_window_get_type (void)
 }
 
 static void
+remove_from_session (EphyWindow *window)
+{
+	Session *session;
+
+	session = SESSION (ephy_shell_get_session (ephy_shell));
+	g_return_if_fail (session != NULL);
+
+	session_remove_window (session, window);
+}
+
+static void
 ephy_window_destroy (GtkObject *gtkobject)
 {
 	EphyWindow *window = EPHY_WINDOW (gtkobject);
 
 	LOG ("EphyWindow destroy %p", window)
 
-	window->priv->closing = TRUE;
+	if (window->priv->closing == FALSE)
+	{
+		window->priv->closing = TRUE;
+
+		remove_from_session (window);
+	}
 
 	if (window->priv->exit_fullscreen_popup)
 	{
@@ -1435,17 +1451,6 @@ save_window_chrome (EphyWindow *window)
 }
 
 static void
-remove_from_session (EphyWindow *window)
-{
-	Session *session;
-
-	session = SESSION (ephy_shell_get_session (ephy_shell));
-	g_return_if_fail (session != NULL);
-
-	session_remove_window (session, window);
-}
-
-static void
 ephy_window_finalize (GObject *object)
 {
         EphyWindow *window;
@@ -1456,8 +1461,6 @@ ephy_window_finalize (GObject *object)
 
         g_return_if_fail (window->priv != NULL);
 
-	remove_from_session (window);
-
 	if (window->priv->find_dialog)
 	{
 		g_object_unref (G_OBJECT (window->priv->find_dialog));