AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: fix rename of wl_shell to xdg_shell

Browse Source 
Regression from 9127087e1c
This commit is contained in:
William Jon McCann 2014-01-20 14:37:33 -05:00
parent 921137540c
commit 83e8e38bd2
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gdk/gdk3-sections.txt
View File

@ -1162,8 +1162,7 @@ gdk_wayland_device_get_wl_pointer
gdk_wayland_device_get_wl_seat gdk_wayland_device_get_wl_seat
gdk_wayland_display_get_wl_compositor gdk_wayland_display_get_wl_compositor
gdk_wayland_display_get_wl_display gdk_wayland_display_get_wl_display
gdk_wayland_display_get_wl_shell gdk_wayland_display_get_xdg_shell
gdk_wayland_window_get_wl_shell_surface
gdk_wayland_window_get_wl_surface gdk_wayland_window_get_wl_surface
gdk_wayland_window_set_use_custom_surface gdk_wayland_window_set_use_custom_surface

2
gdk/wayland/gdkwaylanddisplay.h
View File

@ -50,7 +50,7 @@ struct wl_display *gdk_wayland_display_get_wl_display (GdkDisplay *dis
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
struct wl_compositor *gdk_wayland_display_get_wl_compositor (GdkDisplay *display); struct wl_compositor *gdk_wayland_display_get_wl_compositor (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL 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 GDK_AVAILABLE_IN_3_10
void gdk_wayland_display_set_cursor_theme (GdkDisplay *display, void gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
const gchar *theme, const gchar *theme,

2
gdk/wayland/gdkwindow-wayland.c
View File

@ -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 * 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 * 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 * 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 * as a panel or OSK to the compositor. The assumption is that the
* compositor will expose a private interface to the special client * compositor will expose a private interface to the special client