diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2001-05-07 18:08:10 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2001-05-07 18:08:10 +0000 |
| commit | f14a8073047ea6d95a251a345d870563312f99df (patch) | |
| tree | bee36b80ea580601f55926780a5d3b56ce8fea24 | |
| parent | b4e4a0ed9d66132efad0539bc5901b35ea262d88 (diff) | |
| download | gdk-pixbuf-f14a8073047ea6d95a251a345d870563312f99df.tar.gz | |
Test for bin->child being present before doing anything with it. Patch
2001-05-07 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being
present before doing anything with it. Patch from Håvard Kvålen
<havardk@netcom.no>.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkwindow.c | 3 |
8 files changed, 44 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 924440869..7accc54e7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 924440869..7accc54e7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 924440869..7accc54e7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 924440869..7accc54e7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 924440869..7accc54e7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 924440869..7accc54e7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero <federico@ximian.com> + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + <havardk@netcom.no>. + 2001-05-04 Havoc Pennington <hp@redhat.com> * configure.in: fix some shell typos diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 52654dab0..6ae3b859c 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2417,7 +2417,8 @@ gtk_window_focus (GtkContainer *container, } /* Now try to focus the first widget in the window */ - if (GTK_WIDGET_DRAWABLE (bin->child) && + if (bin->child && + GTK_WIDGET_DRAWABLE (bin->child) && GTK_WIDGET_IS_SENSITIVE (bin->child)) { if (GTK_IS_CONTAINER (bin->child)) |