[gtk+] wayland: fix rename of wl_shell to xdg_shell
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] wayland: fix rename of wl_shell to xdg_shell
- Date: Mon, 20 Jan 2014 19:45:46 +0000 (UTC)
commit 83e8e38bd266ed4aa1424b7ac1a32380cb0da94f
Author: William Jon McCann <william jon mccann gmail com>
Date: Mon Jan 20 14:37:33 2014 -0500
wayland: fix rename of wl_shell to xdg_shell
Regression from 9127087e1c0e93f94552f0ad5170d4dfa785146a
docs/reference/gdk/gdk3-sections.txt | 3 +--
gdk/wayland/gdkwaylanddisplay.h | 2 +-
gdk/wayland/gdkwindow-wayland.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index c0962ff..d602d4b 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -1162,8 +1162,7 @@ gdk_wayland_device_get_wl_pointer
gdk_wayland_device_get_wl_seat
gdk_wayland_display_get_wl_compositor
gdk_wayland_display_get_wl_display
-gdk_wayland_display_get_wl_shell
-gdk_wayland_window_get_wl_shell_surface
+gdk_wayland_display_get_xdg_shell
gdk_wayland_window_get_wl_surface
gdk_wayland_window_set_use_custom_surface
diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index 3510719..b2e7d5a 100644
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -50,7 +50,7 @@ struct wl_display *gdk_wayland_display_get_wl_display (GdkDisplay *dis
GDK_AVAILABLE_IN_ALL
struct wl_compositor *gdk_wayland_display_get_wl_compositor (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
-struct wl_shell *gdk_wayland_display_get_wl_shell (GdkDisplay *display);
+struct xdg_shell *gdk_wayland_display_get_xdg_shell (GdkDisplay *display);
GDK_AVAILABLE_IN_3_10
void gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
const gchar *theme,
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 839b9a0..7407d5c 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -2266,7 +2266,7 @@ gdk_wayland_window_get_wl_surface (GdkWindow *window)
*
* A good example would be writing a panel or on-screen-keyboard as an
* out-of-process helper - as opposed to having those in the compositor
- * process. In this case the underlying surface isn't a wl_shell
+ * process. In this case the underlying surface isn't an xdg_shell
* surface and the panel or OSK client need to identify the wl_surface
* as a panel or OSK to the compositor. The assumption is that the
* compositor will expose a private interface to the special client
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]