[gtk+/wip/william/deprecations: 2/10] mir: add _gdk_mir_window_get_mir_window ()

[William Hua <williamhua src gnome org>]

commit a06bacca3b1d80ecfd0e490bf970544f32ae0a1a
Author: William Hua <william hua canonical com>
Date:   Thu Feb 23 13:42:45 2017 -0500

    mir: add _gdk_mir_window_get_mir_window ()

 gdk/mir/gdkmir-private.h   |    2 ++
 gdk/mir/gdkmirdisplay.c    |   16 ++++++++--------
 gdk/mir/gdkmirwindowimpl.c |   12 ++++++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
index d9fdeb4..8b01e58 100644
--- a/gdk/mir/gdkmir-private.h
+++ b/gdk/mir/gdkmir-private.h
@@ -83,6 +83,8 @@ GdkCursor *_gdk_mir_cursor_new_for_name (GdkDisplay *display, const gchar *name)
 
 const gchar *_gdk_mir_cursor_get_name (GdkCursor *cursor);
 
+MirWindow *_gdk_mir_window_get_mir_window (GdkWindow *window);
+
 GdkWindowImpl *_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window);
 
 void _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirSurfaceState state);
diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
index 8b21029..73c83e4 100644
--- a/gdk/mir/gdkmirdisplay.c
+++ b/gdk/mir/gdkmirdisplay.c
@@ -867,7 +867,7 @@ gdk_mir_display_convert_selection (GdkDisplay *display,
                                    guint32     time)
 {
   GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
-  MirSurface *surface;
+  MirWindow *mir_window;
   MirPersistentId *persistent_id;
   ConvertInfo *info;
 
@@ -877,12 +877,12 @@ gdk_mir_display_convert_selection (GdkDisplay *display,
     gdk_mir_display_real_convert_selection (display, requestor, selection, target, time);
   else if (mir_display->focused_window)
     {
-      surface = gdk_mir_window_get_mir_surface (mir_display->focused_window);
+      mir_window = _gdk_mir_window_get_mir_window (mir_display->focused_window);
 
-      if (!surface)
+      if (!mir_window)
         return;
 
-      persistent_id = mir_surface_request_persistent_id_sync (surface);
+      persistent_id = mir_surface_request_persistent_id_sync (mir_window);
 
       if (!persistent_id)
         return;
@@ -1050,18 +1050,18 @@ _gdk_mir_display_create_paste (GdkDisplay          *display,
                                gsize                paste_size)
 {
   GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
-  MirSurface *surface;
+  MirWindow *mir_window;
   MirPersistentId *persistent_id;
 
   if (!mir_display->focused_window)
     return;
 
-  surface = gdk_mir_window_get_mir_surface (mir_display->focused_window);
+  mir_window = _gdk_mir_window_get_mir_window (mir_display->focused_window);
 
-  if (!surface)
+  if (!mir_window)
     return;
 
-  persistent_id = mir_surface_request_persistent_id_sync (surface);
+  persistent_id = mir_surface_request_persistent_id_sync (mir_window);
 
   if (!persistent_id)
     return;
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 497069e..e09fcbb 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -2186,6 +2186,18 @@ gdk_mir_window_get_mir_surface (GdkWindow *window)
   return impl->surface;
 }
 
+MirWindow *
+_gdk_mir_window_get_mir_window (GdkWindow *window)
+{
+  GdkMirWindowImpl *impl;
+
+  g_return_val_if_fail (GDK_IS_MIR_WINDOW (window), NULL);
+
+  impl = GDK_MIR_WINDOW_IMPL (window->impl);
+
+  return impl->surface;
+}
+
 void
 _gdk_mir_window_set_surface_output (GdkWindow *window, gdouble scale)
 {