From d975ffe7b06db18ba418207270f58ec79eb07ae1 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Mon, 8 Aug 2016 17:57:01 -0600 Subject: Use Gdk::Seat instead of Gdk::DeviceManager (bzr r15046.1.1) --- src/desktop-events.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/desktop-events.cpp') diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 1932a9864..5fef8cbfc 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -21,7 +21,12 @@ #include "ui/dialog/guides.h" #include "desktop-events.h" -#include +#include +#if GTK_CHECK_VERSION(3, 20, 0) +# include +#else +# include +#endif #include <2geom/line.h> #include <2geom/angle.h> @@ -596,8 +601,13 @@ static void init_extended() Glib::ustring avoidName("pad"); auto display = Gdk::Display::get_default(); +#if GTK_CHECK_VERSION(3, 20, 0) + auto seat = display->get_default_seat(); + auto const devices = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL); +#else auto dm = display->get_device_manager(); auto const devices = dm->list_devices(Gdk::DEVICE_TYPE_SLAVE); +#endif if ( !devices.empty() ) { for (auto const dev : devices) { -- cgit v1.2.3