5 files changed, 32 insertions, 21 deletions

diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index a664d5838..9aa03e84a 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002  Ricardo Fernández Pascual
+ *  Copyright (C) 2002  Ricardo Fernández Pascual
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -221,7 +221,7 @@ build_group (EggActionGroup *action_group,
 	egg_action_group_add_action (action_group, action);
 	g_object_unref (action);
 
-	tmp = g_strdup_printf ("<submenu name=\"%sItem\" name=\"%s\">\n",
+	tmp = g_strdup_printf ("<submenu name=\"%sItem\" verb=\"%s\">\n",
 			       verb, verb);
 	xml_string = g_string_append (xml_string, tmp);
 	g_free (tmp);
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index 67c855d2c..c0339c897 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -304,6 +304,8 @@ ephy_tabs_menu_update (EphyTabsMenu *menu)
 		++i;
 	}
 
+	g_list_free (tabs);
+
 	g_string_append (xml, "</placeholder></submenu></menu></Root>");
 
 	egg_menu_merge_insert_action_group (merge, p->action_group, 0);
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));
diff --git a/src/session.c b/src/session.c
index 4f1c8e8d5..7718586b3 100644
--- a/src/session.c
+++ b/src/session.c
@@ -133,9 +133,10 @@ session_class_init (SessionClass *klass)
 			      G_SIGNAL_RUN_FIRST,
 			      G_STRUCT_OFFSET (SessionClass, close_window),
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
+			      g_cclosure_marshal_VOID__OBJECT,
 			      G_TYPE_NONE,
-			      0);
+			      1,
+			      G_TYPE_OBJECT);
 }
 
 static char *
@@ -681,11 +682,15 @@ void
 session_remove_window (Session *session,
 		       EphyWindow *window)
 {
+	g_object_ref (window);
+
+	session->priv->windows = g_list_remove (session->priv->windows, window);
+
 	g_signal_emit (G_OBJECT (session),
 		       session_signals[CLOSE_WINDOW],
-		       0);
+		       0, window);
 
-	session->priv->windows = g_list_remove (session->priv->windows, window);
+	g_object_unref (window);
 
 	/* autodestroy of the session, necessay to avoid
 	 * conflicts with the nautilus view */
diff --git a/src/session.h b/src/session.h
index 98c4f207b..9cba42628 100644
--- a/src/session.h
+++ b/src/session.h
@@ -52,7 +52,8 @@ struct SessionClass
 
 	void ( *new_window)         (Session *session,
 				     EphyWindow *window);
-	void ( *close_window)       (Session *session);
+	void ( *close_window)       (Session *session,
+				     EphyWindow *window);
 };
 
 GType         session_get_type		(void);