[gtk+/wip/baedert/focus: 13/20] window: Simplify _set_focus

[Timm Bäder <baedert src gnome org>]

commit f1b66ba7079695c35820bea49126b16a99cca303
Author: Timm Bäder <mail baedert org>
Date:   Wed Feb 8 14:25:30 2017 +0100

    window: Simplify _set_focus

 gtk/gtkwindow.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 807b0c7..10cbebc 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2493,21 +2493,16 @@ void
 gtk_window_set_focus (GtkWindow *window,
                      GtkWidget *focus)
 {
-  GtkWindowPrivate *priv;
+  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkWidget *parent;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  priv = window->priv;
-
   if (focus)
     {
       g_return_if_fail (GTK_IS_WIDGET (focus));
       g_return_if_fail (gtk_widget_get_can_focus (focus));
-    }
 
-  if (focus)
-    {
       if (!gtk_widget_get_visible (GTK_WIDGET (window)))
         priv->initial_focus = focus;
       else