brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Make wl_shell surface role name shorter

Browse Source 
MetaWaylandSurfaceRoleWlShellSurface -> MetaWaylandWlShellSurface

https://bugzilla.gnome.org/show_bug.cgi?id=763431
This commit is contained in:
Jonas Ådahl 2016-01-14 12:50:12 +08:00
parent 87555359f5
commit 23b1b5f57e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wayland/meta-wayland-wl-shell.c
View File

@ -34,13 +34,13 @@
#include "wayland/meta-wayland-versions.h" #include "wayland/meta-wayland-versions.h"
#include "wayland/meta-window-wayland.h" #include "wayland/meta-window-wayland.h"
struct _MetaWaylandSurfaceRoleWlShellSurface struct _MetaWaylandWlShellSurface
{ {
MetaWaylandSurfaceRoleShellSurface parent; MetaWaylandSurfaceRoleShellSurface parent;
}; };
G_DEFINE_TYPE (MetaWaylandSurfaceRoleWlShellSurface, G_DEFINE_TYPE (MetaWaylandWlShellSurface,
meta_wayland_surface_role_wl_shell_surface, meta_wayland_wl_shell_surface,
META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE); META_TYPE_WAYLAND_SURFACE_ROLE_SHELL_SURFACE);
static void static void
@ -443,7 +443,7 @@ wl_shell_get_shell_surface (struct wl_client *client,
} }
if (!meta_wayland_surface_assign_role (surface, if (!meta_wayland_surface_assign_role (surface,
META_TYPE_WAYLAND_SURFACE_ROLE_WL_SHELL_SURFACE)) META_TYPE_WAYLAND_WL_SHELL_SURFACE))
{ {
wl_resource_post_error (resource, WL_SHELL_ERROR_ROLE, wl_resource_post_error (resource, WL_SHELL_ERROR_ROLE,
"wl_surface@%d already has a different role", "wl_surface@%d already has a different role",
@ -489,7 +489,7 @@ wl_shell_surface_role_commit (MetaWaylandSurfaceRole *surface_role,
MetaWindow *window = surface->window; MetaWindow *window = surface->window;
surface_role_class = surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_surface_role_wl_shell_surface_parent_class); META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_wl_shell_surface_parent_class);
surface_role_class->commit (surface_role, pending); surface_role_class->commit (surface_role, pending);
/* For wl_shell, it's equivalent to an unmap. Semantics /* For wl_shell, it's equivalent to an unmap. Semantics
@ -571,12 +571,12 @@ wl_shell_surface_role_popup_done (MetaWaylandSurfaceRoleShellSurface *shell_surf
} }
static void static void
meta_wayland_surface_role_wl_shell_surface_init (MetaWaylandSurfaceRoleWlShellSurface *wl_shell_surface) meta_wayland_wl_shell_surface_init (MetaWaylandWlShellSurface *wl_shell_surface)
{ {
} }
static void static void
meta_wayland_surface_role_wl_shell_surface_class_init (MetaWaylandSurfaceRoleWlShellSurfaceClass *klass) meta_wayland_wl_shell_surface_class_init (MetaWaylandWlShellSurfaceClass *klass)
{ {
MetaWaylandSurfaceRoleClass *surface_role_class; MetaWaylandSurfaceRoleClass *surface_role_class;
MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class; MetaWaylandSurfaceRoleShellSurfaceClass *shell_surface_role_class;

8
src/wayland/meta-wayland-wl-shell.h
View File

@ -22,10 +22,10 @@
#include "wayland/meta-wayland-surface.h" #include "wayland/meta-wayland-surface.h"
#define META_TYPE_WAYLAND_SURFACE_ROLE_WL_SHELL_SURFACE (meta_wayland_surface_role_wl_shell_surface_get_type ()) #define META_TYPE_WAYLAND_WL_SHELL_SURFACE (meta_wayland_wl_shell_surface_get_type ())
G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleWlShellSurface, G_DECLARE_FINAL_TYPE (MetaWaylandWlShellSurface,
meta_wayland_surface_role_wl_shell_surface, meta_wayland_wl_shell_surface,
META, WAYLAND_SURFACE_ROLE_WL_SHELL_SURFACE, META, WAYLAND_WL_SHELL_SURFACE,
MetaWaylandSurfaceRoleShellSurface); MetaWaylandSurfaceRoleShellSurface);
void meta_wayland_wl_shell_init (MetaWaylandCompositor *compositor); void meta_wayland_wl_shell_init (MetaWaylandCompositor *compositor);