[gtk/wip/matthiasc/can-focus: 1/17] notbook: Fix a bug in focus handling

[Matthias Clasen <matthiasc src gnome org>]

commit 3f15472d38d1842b522dc03359656257b9b53914
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 8 07:48:35 2020 -0400

    notbook: Fix a bug in focus handling
    
    After the header widget was introduced, focus would get
    stuck in a loop between actions and tabs.
    
    This could be seen in the notebook on page 3 of
    widget-factory.

 gtk/gtknotebook.c | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 57f90c8338..d74e2defd3 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3558,6 +3558,8 @@ gtk_notebook_focus (GtkWidget        *widget,
 
   widget_is_focus = gtk_widget_is_focus (widget);
   old_focus_child = gtk_widget_get_focus_child (widget);
+  if (old_focus_child)
+    old_focus_child = gtk_widget_get_focus_child (old_focus_child);
 
   effective_direction = get_effective_direction (notebook, direction);