From 1bc7c3b2bc3979c47a1127716f4a6d51034c1637 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 27 May 2012 16:49:56 +0100 Subject: Get rid of remaining deprecated GdkDevice API usage (bzr r11426) --- src/desktop-events.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src') diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 74450adb6..7a0c144ce 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -546,7 +546,15 @@ static GdkInputSource lastType = GDK_SOURCE_MOUSE; static void init_extended() { std::string avoidName = "pad"; + +#if GTK_CHECK_VERSION(3,0,0) + GdkDisplay *display = gdk_display_get_default(); + GdkDeviceManager *dm = gdk_display_get_device_manager(display); + GList* devices = gdk_device_manager_list_devices(dm, GDK_DEVICE_TYPE_SLAVE); +#else GList* devices = gdk_devices_list(); +#endif + if ( devices ) { for ( GList* curr = devices; curr; curr = g_list_next(curr) ) { GdkDevice* dev = reinterpret_cast(curr->data); @@ -581,6 +589,10 @@ static void init_extended() } } } + +#if GTK_CHECK_VERSION(3,0,0) + g_list_free(devices); +#endif } -- cgit v1.2.3