From: Benjamin Otte <otte@redhat.com>
Date: Wed, 1 Nov 2017 15:00:12 +0000 (+0100)
Subject: broadway: Fix fallout from screen changes
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~978
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=047cf67cb2edae3828e12f80edeb8c42213a0f01;p=gtk4.git

broadway: Fix fallout from screen changes
---

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 7aff3a9f81..15302a447b 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -321,7 +321,7 @@ gdk_broadway_display_get_root_window (GdkDisplay *display)
 {
   GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (display);
 
-  return gdk_broadway_screen_get_root_window (broadway_display->default_screen);
+  return GDK_BROADWAY_SCREEN (broadway_display->default_screen)->root_window;
 }
 
 static void
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index 4e56071b6f..e5e72350a6 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -119,7 +119,6 @@ void _gdk_broadway_display_get_maximal_cursor_size (GdkDisplay *display,
 void       _gdk_broadway_display_create_window_impl     (GdkDisplay    *display,
 							 GdkWindow     *window,
 							 GdkWindow     *real_parent,
-							 GdkScreen     *screen,
 							 GdkEventMask   event_mask,
 							 GdkWindowAttr *attributes);
 gboolean _gdk_broadway_display_set_selection_owner (GdkDisplay *display,
diff --git a/gdk/broadway/gdkscreen-broadway.c b/gdk/broadway/gdkscreen-broadway.c
index f038fa85c9..23926a05b0 100644
--- a/gdk/broadway/gdkscreen-broadway.c
+++ b/gdk/broadway/gdkscreen-broadway.c
@@ -48,12 +48,6 @@ gdk_broadway_screen_get_display (GdkScreen *screen)
   return GDK_BROADWAY_SCREEN (screen)->display;
 }
 
-static GdkWindow *
-gdk_broadway_screen_get_root_window (GdkScreen *screen)
-{
-  return GDK_BROADWAY_SCREEN (screen)->root_window;
-}
-
 void
 _gdk_broadway_screen_size_changed (GdkScreen                       *screen,
                                    BroadwayInputScreenResizeNotify *msg)
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 4106884b2c..01ce2c383b 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -214,7 +214,6 @@ _gdk_broadway_screen_init_root_window (GdkScreen * screen)
 
   impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
 
-  impl->screen = screen;
   impl->wrapper = window;
   impl->id = 0;
 
@@ -273,8 +272,6 @@ _gdk_broadway_display_create_window_impl (GdkDisplay    *display,
   g_hash_table_insert (broadway_display->id_ht, GINT_TO_POINTER(impl->id), window);
   impl->wrapper = window;
 
-  impl->screen = screen;
-
   g_assert (window->window_type == GDK_WINDOW_TOPLEVEL ||
 	    window->window_type == GDK_WINDOW_TEMP);
   g_assert (GDK_WINDOW_TYPE (window->parent) == GDK_WINDOW_ROOT);
diff --git a/gdk/broadway/gdkwindow-broadway.h b/gdk/broadway/gdkwindow-broadway.h
index f6a9ec1c65..74a77057fc 100644
--- a/gdk/broadway/gdkwindow-broadway.h
+++ b/gdk/broadway/gdkwindow-broadway.h
@@ -47,7 +47,6 @@ struct _GdkWindowImplBroadway
   GdkWindowImpl parent_instance;
 
   GdkWindow *wrapper;
-  GdkScreen *screen;
 
   cairo_surface_t *surface;
   cairo_surface_t *last_surface;