Replace deprecated gdk_cursor_unref

(bzr r11196)

8 files changed, 60 insertions, 0 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index b361b8404..ae198f5c1 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -450,7 +450,11 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                 GdkCursor *guide_cursor;
                 guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
                 gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), guide_cursor);
+#if GTK_CHECK_VERSION(3,0,0)
+		g_object_unref(guide_cursor);
+#else
                 gdk_cursor_unref(guide_cursor);
+#endif
             }
 
             char *guide_description = sp_guide_description(guide);
@@ -485,7 +489,11 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                         GdkCursor *guide_cursor;
                         guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
                         gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), guide_cursor);
+#if GTK_CHECK_VERSION(3,0,0)
+			g_object_unref(guide_cursor);
+#else
                         gdk_cursor_unref(guide_cursor);
+#endif
                         ret = TRUE;
                         break;
                     }
@@ -502,7 +510,11 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                     GdkCursor *guide_cursor;
                     guide_cursor = gdk_cursor_new (GDK_EXCHANGE);
                     gdk_window_set_cursor(gtk_widget_get_window (GTK_WIDGET(sp_desktop_canvas(desktop))), guide_cursor);
+#if GTK_CHECK_VERSION(3,0,0)
+		    g_object_unref(guide_cursor);
+#else
                     gdk_cursor_unref(guide_cursor);
+#endif
                     break;
                 default:
                     // do nothing;
diff --git a/src/desktop.cpp b/src/desktop.cpp
index cf71c8f9e..7aabb1245 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -1402,7 +1402,11 @@ void SPDesktop::setWaitingCursor()
 {
     GdkCursor *waiting = gdk_cursor_new(GDK_WATCH);
     gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(sp_desktop_canvas(this))), waiting);
+#if GTK_CHECK_VERSION(3,0,0)
+    g_cursor_unref(waiting);
+#else
     gdk_cursor_unref(waiting);
+#endif
     // GDK needs the flush for the cursor change to take effect
     gdk_flush();
     waiting_cursor = true;
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 4ea4068fe..3bf1179c8 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -158,7 +158,11 @@ static void sp_event_context_dispose(GObject *object) {
     }
 
     if (ec->cursor != NULL) {
+#if GTK_CHECK_VERSION(3,0,0)
+        g_object_unref(ec->cursor);
+#else
         gdk_cursor_unref(ec->cursor);
+#endif
         ec->cursor = NULL;
     }
 
@@ -204,7 +208,11 @@ void sp_event_context_update_cursor(SPEventContext *ec) {
                     );
                 if (pixbuf != NULL) {
                     if (ec->cursor)
+#if GTK_CHECK_VERSION(3,0,0)
+                        g_object_unref(ec->cursor);
+#else
                         gdk_cursor_unref(ec->cursor);
+#endif
                     ec->cursor = gdk_cursor_new_from_pixbuf(display, pixbuf, ec->hot_x, ec->hot_y);
                     g_object_unref(pixbuf);
                 }
@@ -214,7 +222,11 @@ void sp_event_context_update_cursor(SPEventContext *ec) {
                 sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, ec->cursor_shape);
                 if ((bitmap != NULL) && (mask != NULL)) {
                     if (ec->cursor)
+#if GTK_CHECK_VERSION(3,0,0)
+                        g_object_unref(ec->cursor);
+#else
                         gdk_cursor_unref(ec->cursor);
+#endif
                     ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask,
                             &style->black, &style->white, ec->hot_x,
                             ec->hot_y);
diff --git a/src/inkview.cpp b/src/inkview.cpp
index c188827ce..57963577c 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -413,11 +413,19 @@ sp_svgview_waiting_cursor(struct SPSlideShow *ss)
 {
     GdkCursor *waiting = gdk_cursor_new(GDK_WATCH);
     gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ss->window)), waiting);
+#if GTK_CHECK_VERSION(3,0,0)
+    g_object_unref(waiting);
+#else
     gdk_cursor_unref(waiting);
+#endif
     if (ctrlwin) {
         GdkCursor *waiting = gdk_cursor_new(GDK_WATCH);
         gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(ctrlwin)), waiting);
+#if GTK_CHECK_VERSION(3,0,0)
+        g_object_unref(waiting);
+#else
         gdk_cursor_unref(waiting);
+#endif
     }
     while(gtk_events_pending())
        gtk_main_iteration();
diff --git a/src/knot.cpp b/src/knot.cpp
index fe99eb4e1..4da9f01ee 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -245,7 +245,11 @@ static void sp_knot_dispose(GObject *object)
 
     for (gint i = 0; i < SP_KNOT_VISIBLE_STATES; i++) {
         if (knot->cursor[i]) {
+#if GTK_CHECK_VERSION(3,0,0)
+            g_object_unref(knot->cursor[i]);
+#else
             gdk_cursor_unref(knot->cursor[i]);
+#endif
             knot->cursor[i] = NULL;
         }
     }
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 70955c969..37d0e79ec 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -229,11 +229,19 @@ sp_select_context_dispose(GObject *object)
     sc->_describer = NULL;
 
     if (CursorSelectDragging) {
+#if GTK_CHECK_VERSION(3,0,0)
+        g_object_unref(CursorSelectDragging);
+#else
         gdk_cursor_unref (CursorSelectDragging);
+#endif
         CursorSelectDragging = NULL;
     }
     if (CursorSelectMouseover) {
+#if GTK_CHECK_VERSION(3,0,0)
+        g_object_unref(CursorSelectMouseover);
+#else
         gdk_cursor_unref (CursorSelectMouseover);
+#endif
         CursorSelectMouseover = NULL;
     }
 
diff --git a/src/svg-view.cpp b/src/svg-view.cpp
index aa6666445..7559cbb24 100644
--- a/src/svg-view.cpp
+++ b/src/svg-view.cpp
@@ -105,7 +105,11 @@ void SPSVGView::mouseover()
     GdkCursor *cursor = gdk_cursor_new(GDK_HAND2);
     GdkWindow *window = gtk_widget_get_window (GTK_WIDGET(SP_CANVAS_ITEM(_drawing)->canvas));
     gdk_window_set_cursor(window, cursor);
+#if GTK_CHECK_VERSION(3,0,0)
+    g_object_unref(cursor);
+#else
     gdk_cursor_unref(cursor);
+#endif
 }
 
 void SPSVGView::mouseout()
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index ab7b99237..faf518bbd 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1259,7 +1259,11 @@ RotateableSwatch::do_motion(double by, guint modifier) {
             g_object_unref (bitmap);
             g_object_unref (mask);
             gdk_window_set_cursor(gtk_widget_get_window(w), cr);
+#if GTK_CHECK_VERSION(3,0,0)
+	    g_object_unref(cr);
+#else
             gdk_cursor_unref(cr);
+#endif
             cr_set = true;
         }
     }
@@ -1314,7 +1318,11 @@ RotateableSwatch::do_release(double by, guint modifier) {
         GtkWidget *w = GTK_WIDGET(gobj());
         gdk_window_set_cursor(gtk_widget_get_window(w), NULL);
         if (cr) {
+#if GTK_CHECK_VERSION(3,0,0)
+           g_object_unref(cr);
+#else
            gdk_cursor_unref (cr);
+#endif
            cr = NULL;
         }
         cr_set = false;