From: Owen Taylor Date: Fri, 1 Feb 2002 17:53:56 +0000 (+0000) Subject: ri Feb 1 12:51:20 2002 Owen Taylor X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=a7d3cece4721f3d4bbdde816fcb699f4ccb2ded5;p=~andy%2Fgtk ri Feb 1 12:51:20 2002 Owen Taylor * gtk/gtknotebook.c (focus_child_in): Catch the cur_page == NULL (no children) case. (#70287, Paolo Maggi.) --- diff --git a/ChangeLog b/ChangeLog index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3cc822cd7..bf296ddbe 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Feb 1 12:51:20 2002 Owen Taylor + + * gtk/gtknotebook.c (focus_child_in): Catch the + cur_page == NULL (no children) case. (#70287, + Paolo Maggi.) + Fri Feb 1 12:12:12 2002 Owen Taylor * gtk/gtkfilesel.c (attempt_file_completion): diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 962e7f3df..50a6978f5 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -1866,7 +1866,8 @@ static gboolean focus_child_in (GtkNotebook *notebook, GtkDirectionType direction) { - return gtk_widget_child_focus (notebook->cur_page->child, direction); + if (notebook->cur_page) + return gtk_widget_child_focus (notebook->cur_page->child, direction); } /* Focus in the notebook can either be on the pages, or on