[gtk+/wip/matthiasc/monitor] window: Stop using gdk_screen_get_n_monitors

[Matthias Clasen <matthiasc src gnome org>]

commit 6aa3d4cb37b2d783f76db0c0e80655d5eb7aa154
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 10 23:52:00 2016 -0400

    window: Stop using gdk_screen_get_n_monitors

 gtk/gtkwindow.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a02cee3..0080dec 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6188,7 +6188,7 @@ gtk_window_map (GtkWidget *widget)
   GtkWindowPrivate *priv = window->priv;
   GdkWindow *gdk_window;
   GList *link;
-  GdkScreen *screen;
+  GdkDisplay *display;
 
   if (!_gtk_widget_is_toplevel (widget))
     {
@@ -6196,10 +6196,10 @@ gtk_window_map (GtkWidget *widget)
       return;
     }
 
-  screen = _gtk_window_get_screen (window);
-  if (priv->initial_fullscreen_monitor > gdk_screen_get_n_monitors (screen))
+  display = gtk_widget_get_display (widget);
+  if (priv->initial_fullscreen_monitor > gdk_display_get_n_monitors (display))
     priv->initial_fullscreen_monitor = -1;
-    
+
   gtk_widget_set_mapped (widget, TRUE);
 
   child = gtk_bin_get_child (&(window->bin));
@@ -6410,7 +6410,7 @@ gtk_window_guess_default_size (GtkWindow *window,
   int minimum, natural;
 
   widget = GTK_WIDGET (window);
-  display = gdk_screen_get_display (_gtk_window_get_screen (window));
+  display = gtk_widget_get_display (widget);
   gdkwindow = _gtk_widget_get_window (widget);
 
   if (gdkwindow)