[gimp/gtk3-port: 138/274] Replace gdk_cursor_unref() with g_object_unref()

[Michael Natterer <mitch src gnome org>]

commit be219537f0dc8190efdf94e79f6a8d7f3a97960c
Author: Michael Natterer <mitch gimp org>
Date:   Wed Dec 29 15:30:20 2010 +0100

    Replace gdk_cursor_unref() with g_object_unref()

 app/widgets/gimpcursor.c                 |    2 +-
 app/widgets/gimpcurveview.c              |    2 +-
 app/widgets/gimpdialogfactory.c          |    4 ++--
 app/widgets/gimpnavigationview.c         |    6 +++---
 app/widgets/gimpoverlaychild.c           |    2 +-
 plug-ins/common/animation-play.c         |    2 +-
 plug-ins/gradient-flare/gradient-flare.c |    2 +-
 plug-ins/help-browser/dialog.c           |    2 +-
 plug-ins/ifs-compose/ifs-compose.c       |    2 +-
 plug-ins/imagemap/imap_preview.c         |    2 +-
 plug-ins/lighting/lighting-preview.c     |    4 ++--
 plug-ins/lighting/lighting-ui.c          |    2 +-
 plug-ins/map-object/map-object-preview.c |    7 +++++--
 plug-ins/map-object/map-object-ui.c      |    2 +-
 plug-ins/print/print-preview.c           |    4 ++--
 15 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
index 8e1838b..453b8b1 100644
--- a/app/widgets/gimpcursor.c
+++ b/app/widgets/gimpcursor.c
@@ -424,7 +424,7 @@ gimp_cursor_set (GtkWidget          *widget,
                             tool_cursor,
                             modifier);
   gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 
   gdk_display_flush (gtk_widget_get_display (widget));
 }
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
index 4f4bd5c..583ba86 100644
--- a/app/widgets/gimpcurveview.c
+++ b/app/widgets/gimpcurveview.c
@@ -755,7 +755,7 @@ set_cursor (GimpCurveView *view,
       GdkCursor  *cursor  = gdk_cursor_new_for_display (display, new_cursor);
 
       gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (view)), cursor);
-      gdk_cursor_unref (cursor);
+      g_object_unref (cursor);
 
       view->cursor_type = new_cursor;
     }
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index c8f5fce..1bca90b 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -1565,7 +1565,7 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
               display = gtk_widget_get_display (widget);
 
               if (cursor)
-                gdk_cursor_unref (cursor);
+                g_object_unref (cursor);
 
               cursor = gimp_cursor_new (display,
                                         GIMP_HANDEDNESS_RIGHT,
@@ -1580,7 +1580,7 @@ gimp_dialog_factory_set_busy (GimpDialogFactory *factory)
     }
 
   if (cursor)
-    gdk_cursor_unref (cursor);
+    g_object_unref (cursor);
 }
 
 void
diff --git a/app/widgets/gimpnavigationview.c b/app/widgets/gimpnavigationview.c
index a209943..49836b4 100644
--- a/app/widgets/gimpnavigationview.c
+++ b/app/widgets/gimpnavigationview.c
@@ -232,7 +232,7 @@ gimp_navigation_view_grab_pointer (GimpNavigationView *nav_view)
                     GDK_EXTENSION_EVENTS_ALL,
                     NULL, cursor, GDK_CURRENT_TIME);
 
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 }
 
 static gboolean
@@ -260,7 +260,7 @@ gimp_navigation_view_button_press (GtkWidget      *widget,
           display = gtk_widget_get_display (widget);
           cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
           gdk_window_set_cursor (GIMP_VIEW (widget)->event_window, cursor);
-          gdk_cursor_unref (cursor);
+          g_object_unref (cursor);
         }
       else
         {
@@ -362,7 +362,7 @@ gimp_navigation_view_motion_notify (GtkWidget      *widget,
         }
 
       gdk_window_set_cursor (view->event_window, cursor);
-      gdk_cursor_unref (cursor);
+      g_object_unref (cursor);
 
       return FALSE;
     }
diff --git a/app/widgets/gimpoverlaychild.c b/app/widgets/gimpoverlaychild.c
index 44b4ebc..9d118f0 100644
--- a/app/widgets/gimpoverlaychild.c
+++ b/app/widgets/gimpoverlaychild.c
@@ -185,7 +185,7 @@ gimp_overlay_child_realize (GimpOverlayBox   *box,
   gdk_offscreen_window_set_embedder (child->window,
                                      gtk_widget_get_window (widget));
 
-  gdk_cursor_unref (attributes.cursor);
+  g_object_unref (attributes.cursor);
 
   g_signal_connect (child->window, "from-embedder",
                     G_CALLBACK (gimp_overlay_child_from_embedder),
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index cf4eef0..579cb57 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -964,7 +964,7 @@ build_dialog (gchar             *imagename)
   cursor = gdk_cursor_new_for_display (gtk_widget_get_display (shape_window),
                                        GDK_HAND2);
   gdk_window_set_cursor (gtk_widget_get_window (shape_window), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 
   g_signal_connect(shape_drawing_area, "size-allocate",
                    G_CALLBACK(sda_size_callback),
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 0b20b3c..4b8fa99 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2542,7 +2542,7 @@ dlg_preview_realize (GtkWidget *widget)
   GdkCursor  *cursor  = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
   gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 }
 
 static gboolean
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 50c48a4..beb9de9 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -1038,7 +1038,7 @@ view_unrealize (GtkWidget *widget)
 {
   if (busy_cursor)
     {
-      gdk_cursor_unref (busy_cursor);
+      g_object_unref (busy_cursor);
       busy_cursor = NULL;
     }
 }
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index c53f184..a30553b 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -1469,7 +1469,7 @@ design_area_realize (GtkWidget *widget)
   GdkCursor  *cursor  = gdk_cursor_new_for_display (display,
                                                     cursors[ifsDesign->op]);
   gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 }
 
 static gboolean
diff --git a/plug-ins/imagemap/imap_preview.c b/plug-ins/imagemap/imap_preview.c
index cee8c10..6fad781 100644
--- a/plug-ins/imagemap/imap_preview.c
+++ b/plug-ins/imagemap/imap_preview.c
@@ -371,7 +371,7 @@ preview_set_cursor(Preview_t *preview, GdkCursorType cursor_type)
                                                             cursor_type);
 
    gdk_window_set_cursor(gtk_widget_get_window (preview->window), cursor);
-   gdk_cursor_unref(cursor);
+   g_object_unref (cursor);
 
    preview->cursor = cursor_type;
 
diff --git a/plug-ins/lighting/lighting-preview.c b/plug-ins/lighting/lighting-preview.c
index b53ba5e..32a82bb 100644
--- a/plug-ins/lighting/lighting-preview.c
+++ b/plug-ins/lighting/lighting-preview.c
@@ -388,12 +388,12 @@ preview_compute (void)
 
   cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
   gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 
   compute_preview (startx, starty, pw, ph);
   cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
   gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
   gdk_flush ();
 }
 
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 2a20675..bd19914 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -1125,7 +1125,7 @@ main_dialog (GimpDrawable *drawable)
     cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
                                          GDK_HAND2);
     gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
-    gdk_cursor_unref (cursor);
+    g_object_unref (cursor);
   }
 
   if (image_setup (drawable, TRUE))
diff --git a/plug-ins/map-object/map-object-preview.c b/plug-ins/map-object/map-object-preview.c
index afc29b4..c81490b 100644
--- a/plug-ins/map-object/map-object-preview.c
+++ b/plug-ins/map-object/map-object-preview.c
@@ -292,13 +292,13 @@ compute_preview_image (void)
 
   cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
   gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 
   compute_preview (0, 0, width - 1, height - 1, pw, ph);
 
   cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
   gdk_window_set_cursor(gtk_widget_get_window (previewarea), cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 }
 
 gboolean
@@ -315,6 +315,9 @@ preview_expose (GtkWidget      *widget,
   startx = (PREVIEW_WIDTH - pw) / 2;
   starty = (PREVIEW_HEIGHT - ph) / 2;
 
+  if (pw != PREVIEW_WIDTH || ph != PREVIEW_HEIGHT)
+    gdk_window_clear (gtk_widget_get_window (previewarea));
+
   cairo_set_source_surface (cr, preview_surface, startx, starty);
   cairo_rectangle (cr, startx, starty, pw, ph);
   cairo_clip (cr);
diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c
index 148720b..21cf291 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -1438,7 +1438,7 @@ main_dialog (GimpDrawable *drawable)
     cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
                                          GDK_HAND2);
     gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
-    gdk_cursor_unref (cursor);
+    g_object_unref (cursor);
   }
 
   image_setup (drawable, TRUE);
diff --git a/plug-ins/print/print-preview.c b/plug-ins/print/print-preview.c
index 0384952..fb18259 100644
--- a/plug-ins/print/print-preview.c
+++ b/plug-ins/print/print-preview.c
@@ -245,7 +245,7 @@ print_preview_unrealize (GtkWidget *widget)
   PrintPreview *preview = PRINT_PREVIEW (widget);
 
   if (preview->cursor)
-    gdk_cursor_unref (preview->cursor);
+    g_object_unref (preview->cursor);
 
   GTK_WIDGET_CLASS (print_preview_parent_class)->unrealize (widget);
 }
@@ -347,7 +347,7 @@ print_preview_button_press_event (GtkWidget      *widget,
           preview->dragging = TRUE;
         }
 
-      gdk_cursor_unref (cursor);
+      g_object_unref (cursor);
     }
 
   return FALSE;