aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-window.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 24a10416b..720fa5fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-04 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-window.c: (ephy_window_destroy):
+
+ Deactivate the context menu on window close. Fixes bug #156812.
+
2004-12-03 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-session.c: (ephy_session_autoresume):
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 5e53ceb00..627ae62cc 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -456,6 +456,7 @@ static void
ephy_window_destroy (GtkObject *gtkobject)
{
EphyWindow *window = EPHY_WINDOW (gtkobject);
+ GSList *popups;
LOG ("EphyWindow destroy %p", window)
@@ -472,6 +473,10 @@ ephy_window_destroy (GtkObject *gtkobject)
destroy_exit_fullscreen_popup (window);
+ popups = gtk_ui_manager_get_toplevels (window->priv->manager, GTK_UI_MANAGER_POPUP);
+ g_slist_foreach (popups, (GFunc) gtk_menu_shell_deactivate, NULL);
+ g_slist_free (popups);
+
GTK_OBJECT_CLASS (parent_class)->destroy (gtkobject);
}