[gtk+/wip/william/deprecations: 4/10] mir: fix persistent id to window id

[William Hua <williamhua src gnome org>]

commit 33bc10a2fdca3fb4d7d578ccb85e22ae4ba9e0b7
Author: William Hua <william hua canonical com>
Date:   Thu Feb 23 13:55:48 2017 -0500

    mir: fix persistent id to window id

 gdk/mir/gdkmirdisplay.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/gdk/mir/gdkmirdisplay.c b/gdk/mir/gdkmirdisplay.c
index 73c83e4..9660729 100644
--- a/gdk/mir/gdkmirdisplay.c
+++ b/gdk/mir/gdkmirdisplay.c
@@ -868,7 +868,7 @@ gdk_mir_display_convert_selection (GdkDisplay *display,
 {
   GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
   MirWindow *mir_window;
-  MirPersistentId *persistent_id;
+  MirWindowId *mir_window_id;
   ConvertInfo *info;
 
   if (selection != GDK_SELECTION_CLIPBOARD)
@@ -882,12 +882,12 @@ gdk_mir_display_convert_selection (GdkDisplay *display,
       if (!mir_window)
         return;
 
-      persistent_id = mir_surface_request_persistent_id_sync (mir_window);
+      mir_window_id = mir_window_request_window_id_sync (mir_window);
 
-      if (!persistent_id)
+      if (!mir_window_id)
         return;
 
-      if (mir_persistent_id_is_valid (persistent_id))
+      if (mir_window_id_is_valid (mir_window_id))
         {
           info = g_new (ConvertInfo, 1);
           info->display = g_object_ref (display);
@@ -898,13 +898,13 @@ gdk_mir_display_convert_selection (GdkDisplay *display,
 
           content_hub_service_call_get_latest_paste_data (
             mir_display->content_service,
-            mir_persistent_id_as_string (persistent_id),
+            mir_window_id_as_string (mir_window_id),
             NULL,
             paste_data_ready_cb,
             info);
         }
 
-      mir_persistent_id_release (persistent_id);
+      mir_window_id_release (mir_window_id);
     }
 }
 
@@ -1051,7 +1051,7 @@ _gdk_mir_display_create_paste (GdkDisplay          *display,
 {
   GdkMirDisplay *mir_display = GDK_MIR_DISPLAY (display);
   MirWindow *mir_window;
-  MirPersistentId *persistent_id;
+  MirWindowId *mir_window_id;
 
   if (!mir_display->focused_window)
     return;
@@ -1061,23 +1061,23 @@ _gdk_mir_display_create_paste (GdkDisplay          *display,
   if (!mir_window)
     return;
 
-  persistent_id = mir_surface_request_persistent_id_sync (mir_window);
+  mir_window_id = mir_window_request_window_id_sync (mir_window);
 
-  if (!persistent_id)
+  if (!mir_window_id)
     return;
 
-  if (mir_persistent_id_is_valid (persistent_id))
+  if (mir_window_id_is_valid (mir_window_id))
     content_hub_service_call_create_paste_sync (
       mir_display->content_service,
       g_application_get_application_id (g_application_get_default ()),
-      mir_persistent_id_as_string (persistent_id),
+      mir_window_id_as_string (mir_window_id),
       g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE, paste_data, paste_size, sizeof (guchar)),
       paste_formats,
       NULL,
       NULL,
       NULL);
 
-  mir_persistent_id_release (persistent_id);
+  mir_window_id_release (mir_window_id);
 }
 
 gboolean