diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2018-02-23 19:05:05 +0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-02-23 19:07:49 +0800 |
| commit | 4345906663f22e5ad0296d06e5fccafac86ccb3d (patch) | |
| tree | 0dd4c8fdec9717a945672353c72db3eebd48839d | |
| parent | d714a94d97af8b34721236bb8ca6f0e3fd6dc1c9 (diff) | |
| download | mutter-4345906663f22e5ad0296d06e5fccafac86ccb3d.tar.gz | |
wayland: Define abstract role types as actually abstract
They should not be instantiated by themself, only as actual roles.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/5
https://bugzilla.gnome.org/show_bug.cgi?id=791938
| -rw-r--r-- | src/wayland/meta-wayland-actor-surface.c | 6 | ||||
| -rw-r--r-- | src/wayland/meta-wayland-shell-surface.c | 6 | ||||
| -rw-r--r-- | src/wayland/meta-wayland-surface.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/wayland/meta-wayland-actor-surface.c b/src/wayland/meta-wayland-actor-surface.c index 3ffe493f6..c10694a2a 100644 --- a/src/wayland/meta-wayland-actor-surface.c +++ b/src/wayland/meta-wayland-actor-surface.c @@ -30,9 +30,9 @@ #include "wayland/meta-wayland-surface.h" #include "wayland/meta-window-wayland.h" -G_DEFINE_TYPE (MetaWaylandActorSurface, - meta_wayland_actor_surface, - META_TYPE_WAYLAND_SURFACE_ROLE) +G_DEFINE_ABSTRACT_TYPE (MetaWaylandActorSurface, + meta_wayland_actor_surface, + META_TYPE_WAYLAND_SURFACE_ROLE) static void meta_wayland_actor_surface_assigned (MetaWaylandSurfaceRole *surface_role) diff --git a/src/wayland/meta-wayland-shell-surface.c b/src/wayland/meta-wayland-shell-surface.c index a33aa1647..b5f3acacf 100644 --- a/src/wayland/meta-wayland-shell-surface.c +++ b/src/wayland/meta-wayland-shell-surface.c @@ -30,9 +30,9 @@ #include "wayland/meta-wayland-surface.h" #include "wayland/meta-window-wayland.h" -G_DEFINE_TYPE (MetaWaylandShellSurface, - meta_wayland_shell_surface, - META_TYPE_WAYLAND_ACTOR_SURFACE) +G_DEFINE_ABSTRACT_TYPE (MetaWaylandShellSurface, + meta_wayland_shell_surface, + META_TYPE_WAYLAND_ACTOR_SURFACE) void meta_wayland_shell_surface_calculate_geometry (MetaWaylandShellSurface *shell_surface, diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 0fd6237f8..0c1d2cd54 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -81,9 +81,9 @@ typedef struct _MetaWaylandSurfaceRolePrivate G_DEFINE_TYPE (MetaWaylandSurface, meta_wayland_surface, G_TYPE_OBJECT); -G_DEFINE_TYPE_WITH_PRIVATE (MetaWaylandSurfaceRole, - meta_wayland_surface_role, - G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (MetaWaylandSurfaceRole, + meta_wayland_surface_role, + G_TYPE_OBJECT) G_DEFINE_TYPE (MetaWaylandPendingState, meta_wayland_pending_state, |