[mutter] backends: Add missing guards to libwacom calls
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] backends: Add missing guards to libwacom calls
- Date: Fri, 22 Jul 2016 21:21:09 +0000 (UTC)
commit fe09a3c4e2919702a15c258cc3460d908282bcdd
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Jul 22 23:05:18 2016 +0200
backends: Add missing guards to libwacom calls
src/backends/meta-input-settings.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 3dbf39c..cc1bf55 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -142,8 +142,10 @@ meta_input_settings_dispose (GObject *object)
g_clear_object (&priv->monitor_manager);
+#ifdef HAVE_LIBWACOM
if (priv->wacom_db)
libwacom_database_destroy (priv->wacom_db);
+#endif
G_OBJECT_CLASS (meta_input_settings_parent_class)->dispose (object);
}
@@ -1253,12 +1255,14 @@ meta_input_settings_init (MetaInputSettings *settings)
g_signal_connect (priv->monitor_manager, "monitors-changed",
G_CALLBACK (monitors_changed_cb), settings);
+#ifdef HAVE_LIBWACOM
priv->wacom_db = libwacom_database_new ();
if (!priv->wacom_db)
{
g_warning ("Could not create database of Wacom devices, "
"expect tablets to misbehave");
}
+#endif
}
MetaInputSettings *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]