GNOME.org
 

[gimp/gtk3-port: 147/224] Replace gdk_cursor_unref() with g_object_unref()

commit 4204edd9663cca937d1f7ce53ebbe5d4aa13feba
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/common/iwarp.c                  |    2 +-
 plug-ins/common/lens-flare.c             |    2 +-
 plug-ins/common/nova.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 ++--
 18 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
index 9c47bd3..0eb81a1 100644
--- a/app/widgets/gimpcursor.c
+++ b/app/widgets/gimpcursor.c
@@ -422,5 +422,5 @@ 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);
 }
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
index 1751446..3cb717d 100644
--- a/app/widgets/gimpcurveview.c
+++ b/app/widgets/gimpcurveview.c
@@ -747,7 +747,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 ce057c2..d226f7e 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -1535,7 +1535,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_CURSOR_FORMAT_BITMAP,
@@ -1551,7 +1551,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 b610bdb..c00efe4 100644
--- a/app/widgets/gimpnavigationview.c
+++ b/app/widgets/gimpnavigationview.c
@@ -221,7 +221,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
@@ -255,7 +255,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
         {
@@ -359,7 +359,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 19d083a..ecc758e 100644
--- a/app/widgets/gimpoverlaychild.c
+++ b/app/widgets/gimpoverlaychild.c
@@ -182,7 +182,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 2aded2c..abfacd4 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -730,7 +730,7 @@ build_dialog (GimpImageBaseType  basetype,
   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_window, "button-press-event",
                     G_CALLBACK (shape_pressed),
diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c
index 0cc019a..f2144ac 100644
--- a/plug-ins/common/iwarp.c
+++ b/plug-ins/common/iwarp.c
@@ -1670,7 +1670,7 @@ iwarp_realize_callback (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/common/lens-flare.c b/plug-ins/common/lens-flare.c
index 054a2ca..91c3c7d 100644
--- a/plug-ins/common/lens-flare.c
+++ b/plug-ins/common/lens-flare.c
@@ -832,7 +832,7 @@ flare_center_preview_realize (GtkWidget   *widget,
   GdkCursor  *cursor  = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
   gimp_preview_set_default_cursor (center->preview, cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 }
 
 /*
diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c
index 694c36d..89b50e3 100644
--- a/plug-ins/common/nova.c
+++ b/plug-ins/common/nova.c
@@ -522,7 +522,7 @@ nova_center_preview_realize (GtkWidget  *widget,
   GdkCursor  *cursor  = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
   gimp_preview_set_default_cursor (center->preview, cursor);
-  gdk_cursor_unref (cursor);
+  g_object_unref (cursor);
 }
 
 /*
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 92a7920..7b05443 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 a436d3b..e71a9bb 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -1064,7 +1064,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 529de9a..53e23cc 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -1489,7 +1489,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 98bf9a8..4be959a 100644
--- a/plug-ins/imagemap/imap_preview.c
+++ b/plug-ins/imagemap/imap_preview.c
@@ -353,7 +353,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 a97337a..e83d9c9 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -1115,7 +1115,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/map-object/map-object-preview.c b/plug-ins/map-object/map-object-preview.c
index d9a20b1..8d56056 100644
--- a/plug-ins/map-object/map-object-preview.c
+++ b/plug-ins/map-object/map-object-preview.c
@@ -289,13 +289,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
@@ -312,6 +312,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 14db832..461c185 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -1400,7 +1400,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 47b0650..472fab8 100644
--- a/plug-ins/print/print-preview.c
+++ b/plug-ins/print/print-preview.c
@@ -251,7 +251,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);
 }
@@ -353,7 +353,7 @@ print_preview_button_press_event (GtkWidget      *widget,
           preview->dragging = TRUE;
         }
 
-      gdk_cursor_unref (cursor);
+      g_object_unref (cursor);
     }
 
   return FALSE;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]