[mutter/gnome-3-24] backends: Apply tablet settings on all tablet device types during startup

[Carlos Garnacho <carlosg src gnome org>]

commit f0b758b891260d385f8d06e89482fd27db15d76a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jun 30 11:45:48 2017 +0200

    backends: Apply tablet settings on all tablet device types during startup
    
    This skipped the device types that are in use on X11.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782027

 src/backends/meta-input-settings.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 05c3ceb..6c5f261 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -1075,10 +1075,15 @@ static void
 apply_mappable_device_settings (MetaInputSettings *input_settings,
                                 DeviceMappingInfo *info)
 {
+  ClutterInputDeviceType device_type;
+
   update_device_display (input_settings, info->settings, info->device);
+  device_type = clutter_input_device_get_device_type (info->device);
 
-  if (clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE ||
-      clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE)
+  if (device_type == CLUTTER_TABLET_DEVICE ||
+      device_type == CLUTTER_PEN_DEVICE ||
+      device_type == CLUTTER_ERASER_DEVICE ||
+      device_type == CLUTTER_PAD_DEVICE)
     {
       update_tablet_mapping (input_settings, info->settings, info->device);
       update_tablet_area (input_settings, info->settings, info->device);