diff options
Diffstat (limited to 'libnautilus-private/nautilus-canvas-container.c')
| -rw-r--r-- | libnautilus-private/nautilus-canvas-container.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c index 67a8cb8da..148303295 100644 --- a/libnautilus-private/nautilus-canvas-container.c +++ b/libnautilus-private/nautilus-canvas-container.c @@ -2399,8 +2399,10 @@ get_rubber_color (NautilusCanvasContainer *container, gtk_style_context_save (context); gtk_style_context_add_class (context, GTK_STYLE_CLASS_RUBBERBAND); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, bgcolor); gtk_style_context_get_border_color (context, GTK_STATE_FLAG_NORMAL, bordercolor); +G_GNUC_END_IGNORE_DEPRECATIONS gtk_style_context_restore (context); } @@ -4156,11 +4158,13 @@ start_stretching (NautilusCanvasContainer *container) NautilusCanvasContainerDetails *details; NautilusCanvasIcon *icon; GtkWidget *toplevel; + GdkDisplay *display; GtkCornerType corner; GdkCursor *cursor; details = container->details; icon = details->stretch_icon; + display = gdk_display_get_default (); /* Check if we hit the stretch handles. */ if (!nautilus_canvas_item_hit_test_stretch_handles (icon->item, @@ -4171,16 +4175,16 @@ start_stretching (NautilusCanvasContainer *container) switch (corner) { case GTK_CORNER_TOP_LEFT: - cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER); + cursor = gdk_cursor_new_for_display (display, GDK_TOP_LEFT_CORNER); break; case GTK_CORNER_BOTTOM_LEFT: - cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); + cursor = gdk_cursor_new_for_display (display, GDK_BOTTOM_LEFT_CORNER); break; case GTK_CORNER_TOP_RIGHT: - cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER); + cursor = gdk_cursor_new_for_display (display, GDK_TOP_RIGHT_CORNER); break; case GTK_CORNER_BOTTOM_RIGHT: - cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); + cursor = gdk_cursor_new_for_display (display, GDK_BOTTOM_RIGHT_CORNER); break; default: cursor = NULL; |