From bf1d0fb988392de9d355fa74cc9c471e8cf13a20 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 30 Nov 2012 15:27:22 -0500
Subject: Avoid gdk_display_get_pointer().

Use gdk_device_get_position().
---
 calendar/gui/e-calendar-view.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'calendar/gui/e-calendar-view.c')

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 9c21a18739..bc3dc89618 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1888,21 +1888,25 @@ e_calendar_view_move_tip (GtkWidget *widget,
 {
 	GtkAllocation allocation;
 	GtkRequisition requisition;
-	gint w, h;
+	GdkDisplay *display;
 	GdkScreen *screen;
 	GdkScreen *pointer_screen;
-	gint monitor_num, px, py;
 	GdkRectangle monitor;
-
-	screen = gtk_widget_get_screen (widget);
+	GdkDeviceManager *device_manager;
+	GdkDevice *pointer;
+	gint monitor_num, px, py;
+	gint w, h;
 
 	gtk_widget_get_preferred_size (widget, &requisition, NULL);
 	w = requisition.width;
 	h = requisition.height;
 
-	gdk_display_get_pointer (
-		gdk_screen_get_display (screen),
-		&pointer_screen, &px, &py, NULL);
+	screen = gtk_widget_get_screen (widget);
+	display = gdk_screen_get_display (screen);
+	device_manager = gdk_display_get_device_manager (display);
+	pointer = gdk_device_manager_get_client_pointer (device_manager);
+
+	gdk_device_get_position (pointer, &pointer_screen, &px, &py);
 	if (pointer_screen != screen) {
 		px = x;
 		py = y;
-- 
cgit v1.2.3