File gtk2-bnc355402-gtkplug-toplevel-list.diff of Package gtk2

bnc355402 - keep GtkPlug in sync with the global list of toplevels
Fixes crash in Firefox when changing themes, especially after using Flash sites.

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 0818274..39e5bad 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -220,7 +220,7 @@ gtk_plug_set_is_child (GtkPlug  *plug,
       if (GTK_WIDGET_MAPPED (plug))
 	gtk_widget_unmap (GTK_WIDGET (plug));
       
-      GTK_WIDGET_UNSET_FLAGS (plug, GTK_TOPLEVEL);
+      _gtk_window_set_is_toplevel (GTK_WINDOW (plug), FALSE);
       gtk_container_set_resize_mode (GTK_CONTAINER (plug), GTK_RESIZE_PARENT);
 
       _gtk_widget_propagate_hierarchy_changed (GTK_WIDGET (plug), GTK_WIDGET (plug));
@@ -235,7 +235,7 @@ gtk_plug_set_is_child (GtkPlug  *plug,
       plug->modality_group = gtk_window_group_new ();
       gtk_window_group_add_window (plug->modality_group, GTK_WINDOW (plug));
       
-      GTK_WIDGET_SET_FLAGS (plug, GTK_TOPLEVEL);
+      _gtk_window_set_is_toplevel (GTK_WINDOW (plug), TRUE);
       gtk_container_set_resize_mode (GTK_CONTAINER (plug), GTK_RESIZE_QUEUE);
 
       _gtk_widget_propagate_hierarchy_changed (GTK_WIDGET (plug), NULL);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index c020354..0d72aee 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8140,6 +8140,41 @@ _gtk_window_set_is_active (GtkWindow *window,
 }
 
 /**
+ * _gtk_windwo_set_is_toplevel:
+ * @window: a #GtkWindow
+ * @is_toplevel: %TRUE if the window is still a real toplevel (nominally a
+ * parent of the root window); %FALSE if it is not (for example, for an
+ * in-process, parented GtkPlug)
+ *
+ * Internal function used by #GtkPlug when it gets parented/unparented by a
+ * #GtkSocket.  This keeps the @window's #GTK_TOPLEVEL flag in sync with the
+ * global list of toplevel windows.
+ */
+void
+_gtk_window_set_is_toplevel (GtkWindow *window,
+			     gboolean   is_toplevel)
+{
+  if (GTK_WIDGET_TOPLEVEL (window))
+    g_assert (g_list_find (toplevel_list, window) != NULL);
+  else
+    g_assert (g_list_find (toplevel_list, window) == NULL);
+
+  if (is_toplevel == GTK_WIDGET_TOPLEVEL (window))
+    return;
+
+  if (is_toplevel)
+    {
+      GTK_WIDGET_SET_FLAGS (window, GTK_TOPLEVEL);
+      toplevel_list = g_slist_prepend (toplevel_list, window);
+    }
+  else
+    {
+      GTK_WIDGET_UNSET_FLAGS (window, GTK_TOPLEVEL);
+      toplevel_list = g_slist_remove (toplevel_list, window);
+    }
+}
+
+/**
  * _gtk_window_set_has_toplevel_focus:
  * @window: a #GtkWindow
  * @has_toplevel_focus: %TRUE if the in
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 20829ec..4835633 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -420,6 +420,9 @@ void            _gtk_window_unset_focus_and_default (GtkWindow *window,
 void            _gtk_window_set_is_active          (GtkWindow *window,
 						    gboolean   is_active);
 
+void            _gtk_window_set_is_toplevel        (GtkWindow *window,
+						    gboolean   is_toplevel);
+
 typedef void (*GtkWindowKeysForeachFunc) (GtkWindow      *window,
 					  guint           keyval,
 					  GdkModifierType modifiers,