mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 11:32:04 +00:00
wayland-surface: Prefix xdg-shell methods with "xdg_shell_"
This commit is contained in:
parent
d9659d4b36
commit
bd1bec5617
@ -708,6 +708,15 @@ create_surface_extension (MetaWaylandSurfaceExtension *extension,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
xdg_shell_use_unstable_version (struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
int32_t version)
|
||||
{
|
||||
if (version != META_XDG_SHELL_VERSION)
|
||||
g_warning ("Bad xdg_shell version: %d", version);
|
||||
}
|
||||
|
||||
static void
|
||||
xdg_surface_destructor (struct wl_resource *resource)
|
||||
{
|
||||
@ -961,16 +970,7 @@ static const struct xdg_surface_interface meta_wayland_xdg_surface_interface = {
|
||||
};
|
||||
|
||||
static void
|
||||
use_unstable_version (struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
int32_t version)
|
||||
{
|
||||
if (version != META_XDG_SHELL_VERSION)
|
||||
g_warning ("Bad xdg_shell version: %d", version);
|
||||
}
|
||||
|
||||
static void
|
||||
get_xdg_surface (struct wl_client *client,
|
||||
xdg_shell_get_xdg_surface (struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
guint32 id,
|
||||
struct wl_resource *surface_resource)
|
||||
@ -1026,7 +1026,7 @@ static const struct xdg_popup_interface meta_wayland_xdg_popup_interface = {
|
||||
};
|
||||
|
||||
static void
|
||||
get_xdg_popup (struct wl_client *client,
|
||||
xdg_shell_get_xdg_popup (struct wl_client *client,
|
||||
struct wl_resource *resource,
|
||||
uint32_t id,
|
||||
struct wl_resource *surface_resource,
|
||||
@ -1073,9 +1073,9 @@ get_xdg_popup (struct wl_client *client,
|
||||
}
|
||||
|
||||
static const struct xdg_shell_interface meta_wayland_xdg_shell_interface = {
|
||||
use_unstable_version,
|
||||
get_xdg_surface,
|
||||
get_xdg_popup,
|
||||
xdg_shell_use_unstable_version,
|
||||
xdg_shell_get_xdg_surface,
|
||||
xdg_shell_get_xdg_popup,
|
||||
};
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user