[Xfce4-commits] [apps/xfce4-notifyd] 01/01: Use GdkSeat in Gtk3.20 and GdkDeviceManager in Gtk<=3.18 (Bug #12679)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-notifyd.

commit a27dd0f021698d2313593adc2a6406294cf01cb8
Author: Tony Paulic <tony.paulic at gmail.com>
Date:   Mon Jul 4 22:50:04 2016 +0200

    Use GdkSeat in Gtk3.20 and GdkDeviceManager in Gtk<=3.18 (Bug #12679)
---
 xfce4-notifyd/xfce-notify-daemon.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
index 440d515..73ed931 100644
--- a/xfce4-notifyd/xfce-notify-daemon.c
+++ b/xfce4-notifyd/xfce-notify-daemon.c
@@ -663,7 +663,6 @@ xfce_notify_daemon_window_size_allocate(GtkWidget *widget,
     GdkScreen *p_screen = NULL;
     GdkScreen *widget_screen;
     GdkDisplay *display;
-    GdkDeviceManager *device_manager;
     GdkDevice *pointer;
     gint x, y, monitor, screen_n, max_width;
     GdkRectangle *geom_tmp, geom, initial, widget_geom;
@@ -698,8 +697,15 @@ xfce_notify_daemon_window_size_allocate(GtkWidget *widget,
      * gdk_display_get_pointer function! Go GTK...*/
     widget_screen = gtk_widget_get_screen (widget);
     display = gdk_screen_get_display (widget_screen);
-    device_manager = gdk_display_get_device_manager (display);
+
+#if GTK_CHECK_VERSION (3, 20, 0)
+    GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default());
+    pointer = gdk_seat_get_pointer (seat);
+#else
+    GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
     pointer = gdk_device_manager_get_client_pointer (device_manager);
+#endif
+
     gdk_device_get_position (pointer, &p_screen, &x, &y);
 
     monitor = gdk_screen_get_monitor_at_point(p_screen, x, y);
@@ -1436,4 +1442,3 @@ xfce_notify_daemon_new_unique(GError **error)
 
     return xndaemon;
 }
-

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.