isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-15 06:39:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Use standard SINCE version definitions

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-05-12 17:00:49 -04:00
parent 549df04ed8
commit 91f35d6a01
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-wayland-outputs.c
View File

@ -142,12 +142,12 @@ bind_output (struct wl_client *client,
(int)output->crtc->current_mode->refresh_rate); (int)output->crtc->current_mode->refresh_rate);
output->scale = compute_scale (output); output->scale = compute_scale (output);
if (version >= META_WL_OUTPUT_HAS_SCALE) if (version >= WL_OUTPUT_SCALE_SINCE_VERSION)
wl_resource_post_event (resource, wl_resource_post_event (resource,
WL_OUTPUT_SCALE, WL_OUTPUT_SCALE,
output->scale); output->scale);
if (version >= META_WL_OUTPUT_HAS_DONE) if (version >= WL_OUTPUT_DONE_SINCE_VERSION)
wl_resource_post_event (resource, wl_resource_post_event (resource,
WL_OUTPUT_DONE); WL_OUTPUT_DONE);
} }

2
src/wayland/meta-wayland-seat.c
View File

@ -86,7 +86,7 @@ bind_seat (struct wl_client *client,
WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_POINTER |
WL_SEAT_CAPABILITY_KEYBOARD); WL_SEAT_CAPABILITY_KEYBOARD);
if (version >= META_WL_SEAT_HAS_NAME) if (version >= WL_SEAT_NAME_SINCE_VERSION)
wl_seat_send_name (resource, "seat0"); wl_seat_send_name (resource, "seat0");
} }

5
src/wayland/meta-wayland-versions.h
View File

@ -59,9 +59,4 @@
#define META_GTK_SURFACE_VERSION 1 /* from gtk_shell */ #define META_GTK_SURFACE_VERSION 1 /* from gtk_shell */
#define META_WL_SUBSURFACE_VERSION 1 /* from wl_subcompositor */ #define META_WL_SUBSURFACE_VERSION 1 /* from wl_subcompositor */
/* The first version to implement a specific event */
#define META_WL_SEAT_HAS_NAME 2
#define META_WL_OUTPUT_HAS_SCALE 2
#define META_WL_OUTPUT_HAS_DONE 2
#endif #endif