diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-09-10 14:00:45 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-09-10 14:00:45 +0000 |
| commit | a88d8fff6d11ab46c213fc040acc5011e4bb7809 (patch) | |
| tree | 84d61b812e136b8600805cb4b4f4e0fdf7d5d524 | |
| parent | 61f9087af43e02f4c82a6fa950668915e1eaa8a2 (diff) | |
| download | gdk-pixbuf-a88d8fff6d11ab46c213fc040acc5011e4bb7809.tar.gz | |
Move gtk_window_unset_transient_for() call after we do checks involving
Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.c (gtk_window_set_transient_for): Move
gtk_window_unset_transient_for() call after we do checks
involving the old transient parent.
[ From Lance Capser <lmc@cyberhighway.net> ]
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 4 |
8 files changed, 51 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 67fcbf9c7..577c1cbb2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 67fcbf9c7..577c1cbb2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 67fcbf9c7..577c1cbb2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 67fcbf9c7..577c1cbb2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 67fcbf9c7..577c1cbb2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 67fcbf9c7..577c1cbb2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri Sep 10 10:06:56 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/gtkwindow.c (gtk_window_set_transient_for): Move + gtk_window_unset_transient_for() call after we do checks + involving the old transient parent. + [ From Lance Capser <lmc@cyberhighway.net> ] + Wed Sep 8 07:13:29 1999 Tim Janik <timj@gtk.org> * configure.in: fixed "GNU Make" check to pass with new make version diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 4dd0509c7..621f7e713 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -699,13 +699,13 @@ gtk_window_set_transient_for (GtkWindow *window, if (window->transient_parent) { - gtk_window_unset_transient_for (window); - if (GTK_WIDGET_REALIZED (window) && GTK_WIDGET_REALIZED (window->transient_parent) && (!parent || !GTK_WIDGET_REALIZED (parent))) gtk_window_transient_parent_unrealized (GTK_WIDGET (window->transient_parent), GTK_WIDGET (window)); + + gtk_window_unset_transient_for (window); } window->transient_parent = parent; |