[mutter] wayland: Use standard SINCE version definitions
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Use standard SINCE version definitions
- Date: Mon, 12 May 2014 21:01:15 +0000 (UTC)
commit 91f35d6a0179f9ccb584ae4d947dc50fc884f56b
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon May 12 17:00:49 2014 -0400
wayland: Use standard SINCE version definitions
src/wayland/meta-wayland-outputs.c | 4 ++--
src/wayland/meta-wayland-seat.c | 2 +-
src/wayland/meta-wayland-versions.h | 5 -----
3 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c
index 05f1750..0eb26f2 100644
--- a/src/wayland/meta-wayland-outputs.c
+++ b/src/wayland/meta-wayland-outputs.c
@@ -142,12 +142,12 @@ bind_output (struct wl_client *client,
(int)output->crtc->current_mode->refresh_rate);
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_OUTPUT_SCALE,
output->scale);
- if (version >= META_WL_OUTPUT_HAS_DONE)
+ if (version >= WL_OUTPUT_DONE_SINCE_VERSION)
wl_resource_post_event (resource,
WL_OUTPUT_DONE);
}
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index baae0f2..3d35bea 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -86,7 +86,7 @@ bind_seat (struct wl_client *client,
WL_SEAT_CAPABILITY_POINTER |
WL_SEAT_CAPABILITY_KEYBOARD);
- if (version >= META_WL_SEAT_HAS_NAME)
+ if (version >= WL_SEAT_NAME_SINCE_VERSION)
wl_seat_send_name (resource, "seat0");
}
diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h
index ab6b55f..bd61c7a 100644
--- a/src/wayland/meta-wayland-versions.h
+++ b/src/wayland/meta-wayland-versions.h
@@ -59,9 +59,4 @@
#define META_GTK_SURFACE_VERSION 1 /* from gtk_shell */
#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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]