Inherit window groups across transient parents. (#312918, Christian

2005-08-31  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c (gtk_window_set_transient_for): Inherit window
	groups across transient parents.  (#312918, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index a6544f1e0d8036148a235077a83adeb2e2462f3a..cf4614af557edc4c467cfae88b2eae8125632030 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c (gtk_window_set_transient_for): Inherit window
+       groups across transient parents.  (#312918, Christian Persch)
+
        * gtk/gtktreemodel.c: Some documentation fixes.  (#314882,
        Guillaume Cottenceau)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a6544f1e0d8036148a235077a83adeb2e2462f3a..cf4614af557edc4c467cfae88b2eae8125632030 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-08-31  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c (gtk_window_set_transient_for): Inherit window
+       groups across transient parents.  (#312918, Christian Persch)
+
        * gtk/gtktreemodel.c: Some documentation fixes.  (#314882,
        Guillaume Cottenceau)
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b318a99b64d8587983becba17848c9ab05da7ac3..43c8ef7639a8231bf89e61b3d11f5d6051135355 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -1843,6 +1843,10 @@ gtk_window_unset_transient_for  (GtkWindow *window)
 {
   if (window->transient_parent)
     {
+      if (window->transient_parent->group)
+       gtk_window_group_remove_window (window->transient_parent->group,
+                                       window);
+
       g_signal_handlers_disconnect_by_func (window->transient_parent,
                                            gtk_window_transient_parent_realized,
                                            window);
@@ -1927,6 +1931,9 @@ gtk_window_set_transient_for  (GtkWindow *window,
          GTK_WIDGET_REALIZED (parent))
        gtk_window_transient_parent_realized (GTK_WIDGET (parent),
                                              GTK_WIDGET (window));
+
+      if (parent->group)
+       gtk_window_group_add_window (parent->group, window);
     }
 }