From c8986e66ce482714f4ce2adf3c24dd53cca27bbe Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 31 Oct 2017 03:26:54 +0100
Subject: [PATCH] window: Remove gtk_window_get_screen()

It's identical to gtk_widget_get_screen(), just use that one.
---
 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkmountoperation.c              |  4 ++--
 gtk/gtkwindow.c                      | 18 ------------------
 gtk/gtkwindow.h                      |  2 --
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 7065f9b277..e9518c99be 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4728,7 +4728,6 @@ gtk_window_set_transient_for
 gtk_window_set_attached_to
 gtk_window_set_destroy_with_parent
 gtk_window_set_screen
-gtk_window_get_screen
 gtk_window_is_active
 gtk_window_is_maximized
 gtk_window_list_toplevels
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 0979bd0f60..0804a7147e 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -1796,9 +1796,9 @@ gtk_mount_operation_get_screen (GtkMountOperation *op)
   priv = op->priv;
 
   if (priv->dialog)
-    return gtk_window_get_screen (GTK_WINDOW (priv->dialog));
+    return gtk_widget_get_screen (GTK_WIDGET (priv->dialog));
   else if (priv->parent_window)
-    return gtk_window_get_screen (GTK_WINDOW (priv->parent_window));
+    return gtk_widget_get_screen (GTK_WIDGET (priv->parent_window));
   else if (priv->screen)
     return priv->screen;
   else
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 4c5b560218..586d76f646 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -10052,24 +10052,6 @@ gtk_window_check_screen (GtkWindow *window)
     }
 }
 
-/**
- * gtk_window_get_screen:
- * @window: a #GtkWindow.
- *
- * Returns the #GdkScreen associated with @window.
- *
- * Returns: (transfer none): a #GdkScreen.
- *
- * Since: 2.2
- */
-GdkScreen*
-gtk_window_get_screen (GtkWindow *window)
-{
-  g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
-
-  return window->priv->screen;
-}
-
 GdkScreen *
 _gtk_window_get_screen (GtkWindow *window)
 {
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 05e86d28e1..584e46de85 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -253,8 +253,6 @@ GdkGravity gtk_window_get_gravity              (GtkWindow           *window);
 GDK_AVAILABLE_IN_ALL
 void	   gtk_window_set_screen	       (GtkWindow	    *window,
 						GdkScreen	    *screen);
-GDK_AVAILABLE_IN_ALL
-GdkScreen* gtk_window_get_screen	       (GtkWindow	    *window);
 
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_window_is_active                (GtkWindow           *window);