[gtk/present-toplevel-2: 29/59] window: Use new toplevel api

[Matthias Clasen <matthiasc src gnome org>]

commit 0925cb65ca0daaf58b4471d211d2d157e46014ab
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 3 02:36:05 2020 -0800

    window: Use new toplevel api

 gtk/gtkwindow.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0d3da3d0d1..849f18ade5 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4985,20 +4985,15 @@ gtk_window_map (GtkWidget *widget)
 
   gtk_window_present_toplevel (window);
 
-#if 0
-  if (priv->stick_initially)
-    gdk_surface_stick (surface);
-  else
-    gdk_surface_unstick (surface);
+  gdk_toplevel_set_sticky (GDK_TOPLEVEL (priv->surface), priv->stick_initially);
+  gdk_toplevel_set_keep_above (GDK_TOPLEVEL (priv->surface), priv->above_initially);
+  gdk_toplevel_set_keep_below (GDK_TOPLEVEL (priv->surface), priv->below_initially);
 
+#if 0
   if (priv->minimize_initially)
     gdk_surface_minimize (surface);
   else
     gdk_surface_unminimize (surface);
-
-  gdk_surface_set_keep_above (surface, priv->above_initially);
-
-  gdk_surface_set_keep_below (surface, priv->below_initially);
 #endif
 
   gtk_window_set_theme_variant (window);
@@ -7798,7 +7793,7 @@ gtk_window_stick (GtkWindow *window)
   priv->stick_initially = TRUE;
 
   if (priv->surface)
-    gdk_surface_stick (priv->surface);
+    gdk_toplevel_set_sticky (GDK_TOPLEVEL (priv->surface), TRUE);
 }
 
 /**
@@ -7825,7 +7820,7 @@ gtk_window_unstick (GtkWindow *window)
   priv->stick_initially = FALSE;
 
   if (priv->surface)
-    gdk_surface_unstick (priv->surface);
+    gdk_toplevel_set_sticky (GDK_TOPLEVEL (priv->surface), FALSE);
 }
 
 /**
@@ -8025,7 +8020,7 @@ gtk_window_set_keep_above (GtkWindow *window,
   priv->below_initially &= !setting;
 
   if (priv->surface)
-    gdk_surface_set_keep_above (priv->surface, setting);
+    gdk_toplevel_set_keep_above (GDK_TOPLEVEL (priv->surface), setting);
 }
 
 /**
@@ -8067,7 +8062,7 @@ gtk_window_set_keep_below (GtkWindow *window,
   priv->above_initially &= !setting;
 
   if (priv->surface)
-    gdk_surface_set_keep_below (priv->surface, setting);
+    gdk_toplevel_set_keep_below (GDK_TOPLEVEL (priv->surface), setting);
 }
 
 /**