summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2017-02-28 09:51:44 -0500
committerWilliam Hua <william.hua@canonical.com>2017-03-01 02:15:56 -0500
commit54791b65bd510cbe0443f1025d83e41e000bc685 (patch)
treee15b25e7e8ba3b202379e9b70d1abb363758aad7
parentf98e3dd09ad199f21182b89dcc91fb725a97315d (diff)
downloadgtk+-54791b65bd510cbe0443f1025d83e41e000bc685.tar.gz
mir: deprecate gdk_mir_window_get_mir_surface ()
-rw-r--r--gdk/mir/gdkmir.h2
-rw-r--r--gdk/mir/gdkmirwindowimpl.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/gdk/mir/gdkmir.h b/gdk/mir/gdkmir.h
index 38cc80c578..811a8dfe86 100644
--- a/gdk/mir/gdkmir.h
+++ b/gdk/mir/gdkmir.h
@@ -41,7 +41,7 @@ MirConnection *gdk_mir_display_get_mir_connection (GdkDisplay *display);
GDK_AVAILABLE_IN_3_16
GType gdk_mir_window_get_type (void);
-GDK_AVAILABLE_IN_3_16
+GDK_DEPRECATED_IN_3_22
MirSurface *gdk_mir_window_get_mir_surface (GdkWindow *window);
GDK_AVAILABLE_IN_3_16
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 5ba232aa52..b47e4eaa98 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -2110,12 +2110,17 @@ _gdk_mir_window_get_dummy_egl_surface (GdkWindow *window,
return impl->dummy_egl_surface;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
MirSurface *
gdk_mir_window_get_mir_surface (GdkWindow *window)
{
return _gdk_mir_window_get_mir_window (window);
}
+#pragma GCC diagnostic pop
+
MirWindow *
_gdk_mir_window_get_mir_window (GdkWindow *window)
{