summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2016-03-07 11:36:54 +0800
committerJonas Ådahl <jadahl@gmail.com>2016-03-10 12:34:56 +0800
commit9f1d1151b746e76efd0c6925d0e8ff08c6cfffd7 (patch)
tree3b6676d5a6e137af343a0722d87b196e6b27d23a
parentfea1ddcd29d5067f8bda52bf32f167c3d11ed2c9 (diff)
downloadmutter-9f1d1151b746e76efd0c6925d0e8ff08c6cfffd7.tar.gz
wayland: Namespace gtk_shell request handlers
https://bugzilla.gnome.org/show_bug.cgi?id=763284
-rw-r--r--src/wayland/meta-wayland-surface.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index ec8ac2ddf..91ee76f34 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -2023,10 +2023,10 @@ static const struct gtk_surface1_interface meta_wayland_gtk_surface_interface =
};
static void
-get_gtk_surface (struct wl_client *client,
- struct wl_resource *resource,
- guint32 id,
- struct wl_resource *surface_resource)
+gtk_shell_get_gtk_surface (struct wl_client *client,
+ struct wl_resource *resource,
+ guint32 id,
+ struct wl_resource *surface_resource)
{
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
@@ -2046,9 +2046,9 @@ get_gtk_surface (struct wl_client *client,
}
static void
-set_startup_id (struct wl_client *client,
- struct wl_resource *resource,
- const char *startup_id)
+gtk_shell_set_startup_id (struct wl_client *client,
+ struct wl_resource *resource,
+ const char *startup_id)
{
MetaDisplay *display;
@@ -2058,8 +2058,8 @@ set_startup_id (struct wl_client *client,
}
static const struct gtk_shell1_interface meta_wayland_gtk_shell_interface = {
- get_gtk_surface,
- set_startup_id
+ gtk_shell_get_gtk_surface,
+ gtk_shell_set_startup_id,
};
static void