wayland: Check the tablet manager before creating a wp_tablet_seat
authorCarlos Garnacho <carlosg@gnome.org>
Wed, 6 Apr 2016 15:29:11 +0000 (17:29 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Wed, 6 Apr 2016 15:29:11 +0000 (17:29 +0200)
This makes things non-crashy if the compositor doesn't provide wp_tablet_manager

gdk/wayland/gdkdevice-wayland.c

index 4a7d2222867b2425a4f79511aa94abaa322287ec..15ab038a3fc8e11b9947186e092bb2787bd04c43 100644 (file)
@@ -3974,11 +3974,14 @@ _gdk_wayland_device_manager_add_seat (GdkDeviceManager *device_manager,
 
   init_devices (seat);
 
-  seat->wp_tablet_seat =
-    zwp_tablet_manager_v1_get_tablet_seat (display_wayland->tablet_manager,
-                                           wl_seat);
-  zwp_tablet_seat_v1_add_listener (seat->wp_tablet_seat, &tablet_seat_listener,
-                                   seat);
+  if (display_wayland->tablet_manager)
+    {
+      seat->wp_tablet_seat =
+        zwp_tablet_manager_v1_get_tablet_seat (display_wayland->tablet_manager,
+                                               wl_seat);
+      zwp_tablet_seat_v1_add_listener (seat->wp_tablet_seat, &tablet_seat_listener,
+                                       seat);
+    }
 
   gdk_display_add_seat (display, GDK_SEAT (seat));
 }