summaryrefslogtreecommitdiff
path: root/mate-panel/panel-toplevel.c
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-02-08 17:56:28 +0100
committerWolfgang Ulbrich <[email protected]>2016-02-12 07:04:30 +0100
commit217ce17fff3e4eb3670a03c3d48771a03bf3f9d9 (patch)
tree039635cef825eb633d295d834d0b881af439863f /mate-panel/panel-toplevel.c
parentf96389e674b83aa89e9ed943120fe5c0390626b7 (diff)
downloadmate-panel-217ce17fff3e4eb3670a03c3d48771a03bf3f9d9.tar.bz2
mate-panel-217ce17fff3e4eb3670a03c3d48771a03bf3f9d9.tar.xz
do not use deprecated gdk_cursor_new, use
gdk_cursor_new_for_display for both GTK versions
Diffstat (limited to 'mate-panel/panel-toplevel.c')
-rw-r--r--mate-panel/panel-toplevel.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index f740d0c8..fa1b757c 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -438,8 +438,8 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
GdkWindow *window;
GdkCursorType cursor_type;
GdkCursor *cursor;
- GdkDisplay *display;
#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkDisplay *display;
GdkDevice *pointer;
GdkDevice *keyboard;
GdkDeviceManager *device_manager;
@@ -496,9 +496,11 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
cursor_type = panel_toplevel_grab_op_cursor (
toplevel, toplevel->priv->grab_op);
- display = gdk_window_get_display (window);
- cursor = gdk_cursor_new_for_display (display, cursor_type);
+
+ cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
+ cursor_type);
#if GTK_CHECK_VERSION (3, 0, 0)
+ display = gdk_window_get_display (window);
device_manager = gdk_display_get_device_manager (display);
pointer = gdk_device_manager_get_client_pointer (device_manager);
keyboard = gdk_device_get_associated_device (pointer);