From 0b58c96f06011b21aaa6337a2e4e774da4410033 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Thu, 19 May 2016 09:48:46 +0200 Subject: [PATCH] wayland: Make gdk_wayland_window_get_wl_output() private There is no need to make it a public API, move it to the private header instead. https://bugzilla.gnome.org/show_bug.cgi?id=766566 --- docs/reference/gdk/gdk3-sections.txt | 1 - gdk/wayland/gdkprivate-wayland.h | 2 ++ gdk/wayland/gdkwaylandwindow.h | 2 -- gdk/wayland/gdkwindow-wayland.c | 11 ----------- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt index 6dc208c218..0ca8d48ddd 100644 --- a/docs/reference/gdk/gdk3-sections.txt +++ b/docs/reference/gdk/gdk3-sections.txt @@ -1245,7 +1245,6 @@ gdk_wayland_display_get_wl_display gdk_wayland_display_get_xdg_shell gdk_wayland_window_get_wl_surface gdk_wayland_window_set_use_custom_surface -gdk_wayland_window_get_wl_output GDK_TYPE_WAYLAND_DEVICE diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h index 81770f6640..a95c925ca1 100644 --- a/gdk/wayland/gdkprivate-wayland.h +++ b/gdk/wayland/gdkprivate-wayland.h @@ -274,4 +274,6 @@ EGLSurface gdk_wayland_window_get_dummy_egl_surface (GdkWindow *window, void gdk_wayland_seat_set_global_cursor (GdkSeat *seat, GdkCursor *cursor); +struct wl_output *gdk_wayland_window_get_wl_output (GdkWindow *window); + #endif /* __GDK_PRIVATE_WAYLAND_H__ */ diff --git a/gdk/wayland/gdkwaylandwindow.h b/gdk/wayland/gdkwaylandwindow.h index fb84d347ed..e46ce18d79 100644 --- a/gdk/wayland/gdkwaylandwindow.h +++ b/gdk/wayland/gdkwaylandwindow.h @@ -59,8 +59,6 @@ void gdk_wayland_window_set_dbus_properties_libgtk_only (Gdk const char *window_object_path, const char *application_object_path, const char *unique_bus_name); -GDK_AVAILABLE_IN_3_22 -struct wl_output *gdk_wayland_window_get_wl_output (GdkWindow *window); G_END_DECLS diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 64b3cd8457..8ee469b21b 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -2954,17 +2954,6 @@ gdk_wayland_window_get_wl_surface (GdkWindow *window) return GDK_WINDOW_IMPL_WAYLAND (window->impl)->display_server.wl_surface; } -/** - * gdk_wayland_window_get_wl_output: - * @window: (type GdkWaylandWindow): a #GdkWindow - * - * Returns the Wayland output a #GdkWindow has last entered. - * - * Returns: (transfer none): a Wayland wl_output or NULL if the #GdkWindow - * is not associated with any Wayland wl_output. - * - * Since: 3.22 - */ struct wl_output * gdk_wayland_window_get_wl_output (GdkWindow *window) {