From f14a8073047ea6d95a251a345d870563312f99df Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 7 May 2001 18:08:10 +0000 Subject: [PATCH] Test for bin->child being present before doing anything with it. Patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2001-05-07 Federico Mena Quintero * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being present before doing anything with it. Patch from Håvard Kvålen . --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkwindow.c | 3 ++- 8 files changed, 44 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 924440869..7accc54e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-05-07 Federico Mena Quintero + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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 + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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 + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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 + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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 + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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 + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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 + + * gtk/gtkwindow.c (gtk_window_focus): Test for bin->child being + present before doing anything with it. Patch from Håvard Kvålen + . + 2001-05-04 Havoc Pennington * 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)) -- 2.43.2