[mutter] clutter/x11: Fix build without libwacom
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/x11: Fix build without libwacom
- Date: Mon, 10 Jun 2019 14:49:02 +0000 (UTC)
commit c24d8e856b62802a39048e05eb81b35c0018eb97
Author: Pekka Paalanen <pekka paalanen collabora com>
Date: Mon Jun 10 14:19:17 2019 +0300
clutter/x11: Fix build without libwacom
When libwacom is configured disabled, this error appears:
../clutter/clutter/x11/clutter-input-device-xi2.c: In function ‘clutter_input_device_xi2_finalize’:
../clutter/clutter/x11/clutter-input-device-xi2.c:122:7: error: ‘device_xi2’ undeclared (first use in
this function)
if (device_xi2->inhibit_pointer_query_timer)
Fix it with the "obvious" solution.
This code was added in c1303bd642e57d53ccbc8f6eb450c2a45bf4d3ef.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/611
clutter/clutter/x11/clutter-input-device-xi2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/clutter/clutter/x11/clutter-input-device-xi2.c b/clutter/clutter/x11/clutter-input-device-xi2.c
index 0033166c5..39a3c2977 100644
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@@ -117,10 +117,10 @@ clutter_input_device_xi2_finalize (GObject *object)
if (device_xi2->group_modes)
g_array_unref (device_xi2->group_modes);
-#endif
if (device_xi2->inhibit_pointer_query_timer)
g_source_remove (device_xi2->inhibit_pointer_query_timer);
+#endif
G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->finalize (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]