[nautilus] project: replace deprecated gdk_cursor_new



commit e6a2a3f4b70ee15d90a2db73ed37f6064dd661df
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Jul 21 18:00:31 2015 -0300

    project: replace deprecated gdk_cursor_new
    
    In 3.16 release gdk_cursor_new was deprecated in
    favor of gdk_cursor_new_for_display.
    
    Nautilus, however, did not updated to use the
    proposed function, and is still using the deprecated
    method.
    
    Fix that by using the proposed gdk_cursor_new_for_display
    method.

 libnautilus-private/nautilus-canvas-container.c |   10 ++++++----
 src/nautilus-list-view.c                        |    4 ++--
 src/nautilus-properties-window.c                |    6 ++++--
 src/nautilus-window.c                           |    5 ++++-
 4 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index 67a8cb8..a2620dc 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -4156,11 +4156,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 = gtk_widget_get_display (GTK_WIDGET (container));
        
        /* Check if we hit the stretch handles. */
        if (!nautilus_canvas_item_hit_test_stretch_handles (icon->item,
@@ -4171,16 +4173,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;
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index f2c740e..b597753 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -2963,6 +2963,7 @@ nautilus_list_view_click_policy_changed (NautilusView *directory_view)
        GtkTreeView *tree;
 
        view = NAUTILUS_LIST_VIEW (directory_view);
+        display = gtk_widget_get_display (GTK_WIDGET (view));
 
        /* ensure that we unset the hand cursor and refresh underlined rows */
        if (get_click_policy () == NAUTILUS_CLICK_POLICY_DOUBLE) {
@@ -2982,7 +2983,6 @@ nautilus_list_view_click_policy_changed (NautilusView *directory_view)
                        win = gtk_widget_get_window (GTK_WIDGET (tree));
                        gdk_window_set_cursor (win, NULL);
 
-                       display = gtk_widget_get_display (GTK_WIDGET (view));
                        if (display != NULL) {
                                gdk_display_flush (display);
                        }
@@ -2991,7 +2991,7 @@ nautilus_list_view_click_policy_changed (NautilusView *directory_view)
                g_clear_object (&hand_cursor);
        } else if (get_click_policy () == NAUTILUS_CLICK_POLICY_SINGLE) {
                if (hand_cursor == NULL) {
-                       hand_cursor = gdk_cursor_new(GDK_HAND2);
+                       hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
                }
        }
 }
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 4ad4d8b..2607c58 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -3103,9 +3103,11 @@ start_long_operation (NautilusPropertiesWindow *window)
 {
        if (window->details->long_operation_underway == 0) {
                /* start long operation */
+                GdkDisplay *display;
                GdkCursor * cursor;
-               
-               cursor = gdk_cursor_new (GDK_WATCH);
+
+                display = gtk_widget_get_display (GTK_WIDGET (window));
+               cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
                gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor);
                g_object_unref (cursor);
        }
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index f77a73e..1b76772 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -761,7 +761,10 @@ update_cursor (NautilusWindow *window)
        slot = nautilus_window_get_active_slot (window);
 
        if (nautilus_window_slot_get_allow_stop (slot)) {
-               cursor = gdk_cursor_new (GDK_WATCH);
+                GdkDisplay *display;
+
+                display = gtk_widget_get_display (GTK_WIDGET (window));
+               cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
                gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (window)), cursor);
                g_object_unref (cursor);
        } else {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]