ri Feb 1 12:51:20 2002 Owen Taylor <otaylor@redhat.com>

        * gtk/gtknotebook.c (focus_child_in): Catch the
        cur_page == NULL (no children) case. (#70287,
        Paolo Maggi.)

diff --git a/ChangeLog b/ChangeLog
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3cc822cd7c92d6c233e2f8f0eab3095b8be83bd1..bf296ddbe5eacc734ee698dbd42a83faf812c205 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkfilesel.c (attempt_file_completion): 

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 962e7f3df56bf38308742c86984620b10ec7961e..50a6978f5f5fc491cd6d3495d1fece62108e4e66 100644 (file)
--- 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