summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryetist <[email protected]>2015-06-18 23:33:03 +0800
committerinfirit <[email protected]>2015-08-26 14:44:56 +0200
commitf3423b7e59b3dea7579cddb208ada0e2d671c6c3 (patch)
tree14cf579984afa6c74e64ee08d498f7c52eaa6a98
parentb132423fde1c0befb0d3a327b534f3ada6fabf3f (diff)
downloadmate-panel-f3423b7e59b3dea7579cddb208ada0e2d671c6c3.tar.bz2
mate-panel-f3423b7e59b3dea7579cddb208ada0e2d671c6c3.tar.xz
Gtk3: Don't use deprecated gdk_cursor_new
-rw-r--r--mate-panel/panel-toplevel.c6
-rw-r--r--mate-panel/panel-widget.c3
2 files changed, 4 insertions, 5 deletions
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index b58b3394..e57627e1 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;
-#if GTK_CHECK_VERSION (3, 0, 0)
GdkDisplay *display;
+#if GTK_CHECK_VERSION (3, 0, 0)
GdkDevice *pointer;
GdkDevice *keyboard;
GdkDeviceManager *device_manager;
@@ -496,9 +496,9 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
cursor_type = panel_toplevel_grab_op_cursor (
toplevel, toplevel->priv->grab_op);
- cursor = gdk_cursor_new (cursor_type);
-#if GTK_CHECK_VERSION (3, 0, 0)
display = gdk_window_get_display (window);
+ cursor = gdk_cursor_new_for_display (display, cursor_type);
+#if GTK_CHECK_VERSION (3, 0, 0)
device_manager = gdk_display_get_device_manager (display);
pointer = gdk_device_manager_get_client_pointer (device_manager);
keyboard = gdk_device_get_associated_device (pointer);
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 10796e8b..30e55f9c 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -2014,9 +2014,8 @@ panel_widget_applet_drag_start (PanelWidget *panel,
GdkDevice *pointer;
GdkDeviceManager *device_manager;
- fleur_cursor = gdk_cursor_new (GDK_FLEUR);
-
display = gdk_window_get_display (window);
+ fleur_cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
device_manager = gdk_display_get_device_manager (display);
pointer = gdk_device_manager_get_client_pointer (device_manager);
status = gdk_device_grab (pointer, window,