broadway: Fix fallout from screen changes

diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 7aff3a9f8153b6b422b9605f57e708e60285b4ee..15302a447b3d8cdd0fd27c04305e2d496d9f4a8a 100644 (file)
--- 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 4e56071b6f10f2b6a6abae064660cb4e22c02532..e5e72350a6db83991b70bf83d6a1e14d24cdf7ca 100644 (file)
--- 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 f038fa85c90cdea554a21f055875507e8c43b0f6..23926a05b0b303900dbcb65ef1b59aa6f9a52573 100644 (file)
--- 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 4106884b2ce9dac600cfd21d9559537d1df94f5a..01ce2c383b0011c586a3094133fd300165d878fe 100644 (file)
--- 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 f6a9ec1c650412a7cfbd635a5401ec4ceec80540..74a77057fc500d0e559e3dd5bcc278a394411ed3 100644 (file)
--- 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;