[librsvg] remove needless G_OBJECT macros.

From: Hiroyuki Ikezoe <hiikezoe src gnome org>
To: commits-list gnome org
Cc:
Subject: [librsvg] remove needless G_OBJECT macros.
Date: Wed, 7 Apr 2010 03:40:09 +0000 (UTC)
commit 414f4156521e444a3c4f52ace5a3ed0d2a9be8a7
Author: Hiroyuki Ikezoe <poincare ikezoe net>
Date:   Wed Apr 7 12:39:38 2010 +0900

    remove needless G_OBJECT macros.

 gdk-pixbuf-loader/io-svg.c |    2 +-
 gtk-engine/svg-render.c    |    4 +-
 rsvg-base-file-util.c      |    4 +-
 rsvg-base.c                |    2 +-
 rsvg-cairo-draw.c          |    6 +-
 rsvg-convert.c             |    8 ++--
 rsvg-dimensions.c          |    4 +-
 rsvg-file-util.c           |   12 +++---
 rsvg-filter.c              |   92 ++++++++++++++++++++++----------------------
 rsvg-gobject.c             |    6 +-
 rsvg-image.c               |    2 +-
 rsvg-text.c                |    2 +-
 test-display.c             |   24 ++++++------
 tests/rsvg-test.c          |    2 +-
 14 files changed, 85 insertions(+), 85 deletions(-)
---
diff --git a/gdk-pixbuf-loader/io-svg.c b/gdk-pixbuf-loader/io-svg.c
index 5d24c78..030bf66 100644
--- a/gdk-pixbuf-loader/io-svg.c
+++ b/gdk-pixbuf-loader/io-svg.c
@@ -162,7 +162,7 @@ gdk_pixbuf__svg_image_stop_load (gpointer data, GError **error)
                 result = FALSE;
         }
 
-        g_object_unref (G_OBJECT(context->handle));
+        g_object_unref (context->handle);
         g_free (context);
 
         return TRUE;
diff --git a/gtk-engine/svg-render.c b/gtk-engine/svg-render.c
index 7b8cdb3..ebe2f22 100644
--- a/gtk-engine/svg-render.c
+++ b/gtk-engine/svg-render.c
@@ -641,7 +641,7 @@ svg_cache_value_free(gpointer foo)
 
   handle = (RsvgHandle *)foo;
   if(handle != NULL)
-    g_object_unref(G_OBJECT(handle));
+    g_object_unref(handle);
 }
 
 #define SVG_BUFFER_SIZE (1024*8)
@@ -859,5 +859,5 @@ theme_pixbuf_render (ThemePixbuf  *theme_pb,
 	}
     }
 
-  g_object_unref(G_OBJECT(pixbuf));
+  g_object_unref(pixbuf);
 }
diff --git a/rsvg-base-file-util.c b/rsvg-base-file-util.c
index cda64af..483dfd3 100644
--- a/rsvg-base-file-util.c
+++ b/rsvg-base-file-util.c
@@ -62,7 +62,7 @@ rsvg_handle_new_from_data (const guint8 * data, gsize data_len, GError ** error)
 
     if (handle) {
         if (!rsvg_handle_fill_with_data (handle, data, data_len, error)) {
-            g_object_unref (G_OBJECT (handle));
+            g_object_unref (handle);
             handle = NULL;
         }
     }
@@ -97,7 +97,7 @@ rsvg_handle_new_from_file (const gchar * file_name, GError ** error)
         if (handle) {
             rsvg_handle_set_base_uri (handle, base_uri);
             if (!rsvg_handle_fill_with_data (handle, f->data, f->len, error)) {
-                g_object_unref (G_OBJECT (handle));
+                g_object_unref (handle);
                 handle = NULL;
             }
         }
diff --git a/rsvg-base.c b/rsvg-base.c
index c25ed0e..8b96bd6 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -1762,7 +1762,7 @@ rsvg_handle_close (RsvgHandle * handle, GError ** error)
             }
             remaining = gsf_input_remaining (gzip);
         }
-        g_object_unref (G_OBJECT (gzip));
+        g_object_unref (gzip);
 
         /* close parent */
         gsf_output_close (handle->priv->gzipped_data);
diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
index 6c71a60..031a8b1 100644
--- a/rsvg-cairo-draw.c
+++ b/rsvg-cairo-draw.c
@@ -987,8 +987,8 @@ rsvg_cairo_pop_render_stack (RsvgDrawingCtx * ctx)
 
 
         output = rsvg_filter_render (state->filter, pixbuf, bg, ctx, &render->bbox, "2103");
-        g_object_unref (G_OBJECT (pixbuf));
-        g_object_unref (G_OBJECT (bg));
+        g_object_unref (pixbuf);
+        g_object_unref (bg);
 
         surface = cairo_image_surface_create_for_data (gdk_pixbuf_get_pixels (output),
                                                        CAIRO_FORMAT_ARGB32,
@@ -1029,7 +1029,7 @@ rsvg_cairo_pop_render_stack (RsvgDrawingCtx * ctx)
     render->bb_stack = g_list_delete_link (render->bb_stack, render->bb_stack);
 
     if (state->filter) {
-        g_object_unref (G_OBJECT (output));
+        g_object_unref (output);
         cairo_surface_destroy (surface);
     }
 }
diff --git a/rsvg-convert.c b/rsvg-convert.c
index 5983dea..6f4e8eb 100644
--- a/rsvg-convert.c
+++ b/rsvg-convert.c
@@ -74,17 +74,17 @@ rsvg_handle_new_from_stdio_file (FILE * f, GError ** error)
 
         if (length > 0) {
             if (!rsvg_handle_write (handle, buffer, length, error)) {
-                g_object_unref (G_OBJECT (handle));
+                g_object_unref (handle);
                 return NULL;
             }
         } else if (ferror (f)) {
-            g_object_unref (G_OBJECT (handle));
+            g_object_unref (handle);
             return NULL;
         }
     }
 
     if (!rsvg_handle_close (handle, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
@@ -321,7 +321,7 @@ main (int argc, char **argv)
         else
             cairo_show_page (cr);
 
-        g_object_unref (G_OBJECT (rsvg));
+        g_object_unref (rsvg);
     }
 
     cairo_destroy (cr);
diff --git a/rsvg-dimensions.c b/rsvg-dimensions.c
index f8f0283..4eec1c6 100644
--- a/rsvg-dimensions.c
+++ b/rsvg-dimensions.c
@@ -115,14 +115,14 @@ main (int	  argc,
 			goto bail;
 		}
 
-		g_object_unref (G_OBJECT (handle)), handle = NULL;
+		g_object_unref (handle), handle = NULL;
 	}
 
 	exit_code = EXIT_SUCCESS;
 
 bail:
 	if (handle)
-		g_object_unref (G_OBJECT (handle)), handle = NULL;
+		g_object_unref (handle), handle = NULL;
 	if (context)
 		g_option_context_free (context), context = NULL;
 	if (error)
diff --git a/rsvg-file-util.c b/rsvg-file-util.c
index 3adde39..c30e2c7 100644
--- a/rsvg-file-util.c
+++ b/rsvg-file-util.c
@@ -132,17 +132,17 @@ rsvg_pixbuf_from_data_with_size_data (const guchar * buff,
     rsvg_handle_set_base_uri (handle, base_uri);
 
     if (!rsvg_handle_write (handle, buff, len, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
     if (!rsvg_handle_close (handle, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
     retval = rsvg_handle_get_pixbuf (handle);
-    g_object_unref (G_OBJECT (handle));
+    g_object_unref (handle);
 
     return retval;
 }
@@ -166,17 +166,17 @@ rsvg_pixbuf_from_stdio_file_with_size_data (GByteArray * f,
     rsvg_handle_set_base_uri (handle, base_uri);
 
     if (!rsvg_handle_write (handle, f->data, f->len, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
     if (!rsvg_handle_close (handle, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
     retval = rsvg_handle_get_pixbuf (handle);
-    g_object_unref (G_OBJECT (handle));
+    g_object_unref (handle);
 
     return retval;
 }
diff --git a/rsvg-filter.c b/rsvg-filter.c
index c2928dc..0f8b853 100644
--- a/rsvg-filter.c
+++ b/rsvg-filter.c
@@ -435,7 +435,7 @@ rsvg_filter_free_pair (gpointer value)
     RsvgFilterPrimitiveOutput *output;
 
     output = (RsvgFilterPrimitiveOutput *) value;
-    g_object_unref (G_OBJECT (output->result));
+    g_object_unref (output->result);
     g_free (output);
 }
 
@@ -466,7 +466,7 @@ rsvg_filter_render (RsvgFilter * self, GdkPixbuf * source,
     ctx->results = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, rsvg_filter_free_pair);
     ctx->ctx = context;
 
-    g_object_ref (G_OBJECT (source));
+    g_object_ref (source);
 
     rsvg_filter_fix_coordinate_system (ctx, rsvg_state_current (context), *bounds);
 
@@ -509,17 +509,17 @@ rsvg_filter_store_output (GString * name, RsvgFilterPrimitiveOutput result, Rsvg
 {
     RsvgFilterPrimitiveOutput *store;
 
-    g_object_unref (G_OBJECT (ctx->lastresult.result));
+    g_object_unref (ctx->lastresult.result);
 
     store = g_new (RsvgFilterPrimitiveOutput, 1);
     *store = result;
 
     if (strcmp (name->str, "")) {
-        g_object_ref (G_OBJECT (result.result));        /* increments the references for the table */
+        g_object_ref (result.result);        /* increments the references for the table */
         g_hash_table_insert (ctx->results, g_strdup (name->str), store);
     }
 
-    g_object_ref (G_OBJECT (result.result));    /* increments the references for the last result */
+    g_object_ref (result.result);    /* increments the references for the last result */
     ctx->lastresult = result;
 }
 
@@ -579,17 +579,17 @@ rsvg_filter_get_result (GString * name, RsvgFilterContext * ctx)
     output.bounds.x0 = output.bounds.x1 = output.bounds.y0 = output.bounds.y1 = 0;
 
     if (!strcmp (name->str, "SourceGraphic")) {
-        g_object_ref (G_OBJECT (ctx->source));
+        g_object_ref (ctx->source);
         output.result = ctx->source;
         output.Rused = output.Gused = output.Bused = output.Aused = 1;
         return output;
     } else if (!strcmp (name->str, "BackgroundImage")) {
-        g_object_ref (G_OBJECT (ctx->bg));
+        g_object_ref (ctx->bg);
         output.result = ctx->bg;
         output.Rused = output.Gused = output.Bused = output.Aused = 1;
         return output;
     } else if (!strcmp (name->str, "") || !strcmp (name->str, "none") || !name) {
-        g_object_ref (G_OBJECT (ctx->lastresult.result));
+        g_object_ref (ctx->lastresult.result);
         output = ctx->lastresult;
         return output;
     } else if (!strcmp (name->str, "SourceAlpha")) {
@@ -608,14 +608,14 @@ rsvg_filter_get_result (GString * name, RsvgFilterContext * ctx)
 
     if (outputpointer != NULL) {
         output = *outputpointer;
-        g_object_ref (G_OBJECT (output.result));
+        g_object_ref (output.result);
         return output;
     }
 
     g_warning (_("%s not found\n"), name->str);
 
     output = ctx->lastresult;
-    g_object_ref (G_OBJECT (ctx->lastresult.result));
+    g_object_ref (ctx->lastresult.result);
     return output;
 }
 
@@ -859,9 +859,9 @@ rsvg_filter_primitive_blend_render (RsvgFilterPrimitive * self, RsvgFilterContex
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (in2));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (in2);
+    g_object_unref (output);
 }
 
 static void
@@ -1061,8 +1061,8 @@ rsvg_filter_primitive_convolve_matrix_render (RsvgFilterPrimitive * self, RsvgFi
         }
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -1364,8 +1364,8 @@ rsvg_filter_primitive_gaussian_blur_render (RsvgFilterPrimitive * self, RsvgFilt
     op.bounds = boundarys;
     rsvg_filter_store_output (self->result, op, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -1499,8 +1499,8 @@ rsvg_filter_primitive_offset_render (RsvgFilterPrimitive * self, RsvgFilterConte
 
     rsvg_filter_store_output (self->result, out, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -1595,12 +1595,12 @@ rsvg_filter_primitive_merge_render (RsvgFilterPrimitive * self, RsvgFilterContex
         in = rsvg_filter_get_in (mn->in, ctx);
         rsvg_alpha_blt (in, boundarys.x0, boundarys.y0, boundarys.x1 - boundarys.x0,
                         boundarys.y1 - boundarys.y0, output, boundarys.x0, boundarys.y0);
-        g_object_unref (G_OBJECT (in));
+        g_object_unref (in);
     }
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (output);
 }
 
 static void
@@ -1785,8 +1785,8 @@ rsvg_filter_primitive_colour_matrix_render (RsvgFilterPrimitive * self, RsvgFilt
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -2103,8 +2103,8 @@ rsvg_filter_primitive_component_transfer_render (RsvgFilterPrimitive *
         }
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -2301,8 +2301,8 @@ rsvg_filter_primitive_erode_render (RsvgFilterPrimitive * self, RsvgFilterContex
             }
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -2509,9 +2509,9 @@ rsvg_filter_primitive_composite_render (RsvgFilterPrimitive * self, RsvgFilterCo
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (in2));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (in2);
+    g_object_unref (output);
 }
 
 static void
@@ -2644,7 +2644,7 @@ rsvg_filter_primitive_flood_render (RsvgFilterPrimitive * self, RsvgFilterContex
 
     rsvg_filter_store_output (self->result, out, ctx);
 
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (output);
 }
 
 static void
@@ -2805,9 +2805,9 @@ rsvg_filter_primitive_displacement_map_render (RsvgFilterPrimitive * self, RsvgF
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (in2));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (in2);
+    g_object_unref (output);
 }
 
 static void
@@ -3176,8 +3176,8 @@ rsvg_filter_primitive_turbulence_render (RsvgFilterPrimitive * self, RsvgFilterC
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -3324,12 +3324,12 @@ rsvg_filter_primitive_image_render_ext (RsvgFilterPrimitive * self, RsvgFilterCo
                            (boundarys.y1 - boundarys.y0) / ctx->paffine[3]);
 
     if (!intermediate) {
-        g_object_unref (G_OBJECT (img));
+        g_object_unref (img);
         return NULL;
     }
 
 
-    g_object_unref (G_OBJECT (img));
+    g_object_unref (img);
 
     length = gdk_pixbuf_get_height (intermediate) * gdk_pixbuf_get_rowstride (intermediate);
     for (i = 0; i < 4; i++)
@@ -3381,12 +3381,12 @@ rsvg_filter_primitive_image_render (RsvgFilterPrimitive * self, RsvgFilterContex
             gdk_pixbuf_copy_area (img, 0, 0,
                                   boundarys.x1 - boundarys.x0,
                                   boundarys.y1 - boundarys.y0, output, boundarys.x0, boundarys.y0);
-            g_object_unref (G_OBJECT (img));
+            g_object_unref (img);
         }
     } else {
         gdk_pixbuf_copy_area (img, boundarys.x0, boundarys.y0, boundarys.x1 - boundarys.x0,
                               boundarys.y1 - boundarys.y0, output, boundarys.x0, boundarys.y0);
-        g_object_unref (G_OBJECT (img));
+        g_object_unref (img);
     }
 
     op.result = output;
@@ -3398,7 +3398,7 @@ rsvg_filter_primitive_image_render (RsvgFilterPrimitive * self, RsvgFilterContex
 
     rsvg_filter_store_output (self->result, op, ctx);
 
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (output);
 }
 
 static void
@@ -3966,8 +3966,8 @@ rsvg_filter_primitive_diffuse_lighting_render (RsvgFilterPrimitive * self, RsvgF
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -4145,8 +4145,8 @@ rsvg_filter_primitive_specular_lighting_render (RsvgFilterPrimitive * self, Rsvg
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (in));
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (in);
+    g_object_unref (output);
 }
 
 static void
@@ -4278,7 +4278,7 @@ rsvg_filter_primitive_tile_render (RsvgFilterPrimitive * self, RsvgFilterContext
 
     rsvg_filter_store_result (self->result, output, ctx);
 
-    g_object_unref (G_OBJECT (output));
+    g_object_unref (output);
 }
 
 static void
diff --git a/rsvg-gobject.c b/rsvg-gobject.c
index 8c6d619..00a252a 100644
--- a/rsvg-gobject.c
+++ b/rsvg-gobject.c
@@ -94,7 +94,7 @@ instance_dispose (GObject * instance)
 
 #if HAVE_SVGZ
     if (self->priv->is_gzipped)
-        g_object_unref (G_OBJECT (self->priv->gzipped_data));
+        g_object_unref (self->priv->gzipped_data);
 #endif
 
     g_hash_table_foreach (self->priv->entities, rsvg_ctx_free_helper, NULL);
@@ -116,7 +116,7 @@ instance_dispose (GObject * instance)
 
     g_free (self->priv);
 
-    rsvg_parent_class->dispose (G_OBJECT (self));
+    rsvg_parent_class->dispose (instance);
 }
 
 static void
@@ -313,7 +313,7 @@ rsvg_handle_get_type (void)
 void
 rsvg_handle_free (RsvgHandle * handle)
 {
-    g_object_unref (G_OBJECT (handle));
+    g_object_unref (handle);
 }
 
 /**
diff --git a/rsvg-image.c b/rsvg-image.c
index 096ed09..c91f666 100644
--- a/rsvg-image.c
+++ b/rsvg-image.c
@@ -474,7 +474,7 @@ rsvg_node_image_free (RsvgNode * self)
     g_free (z->super.state);
     z->super.state = NULL;
     if (z->img)
-        g_object_unref (G_OBJECT (z->img));
+        g_object_unref (z->img);
     _rsvg_node_free(self);
 }
 
diff --git a/rsvg-text.c b/rsvg-text.c
index 05353dd..f0d0496 100644
--- a/rsvg-text.c
+++ b/rsvg-text.c
@@ -508,7 +508,7 @@ rsvg_text_get_pango_context (RsvgDrawingCtx * ctx)
 static void
 rsvg_text_layout_free (RsvgTextLayout * layout)
 {
-    g_object_unref (G_OBJECT (layout->layout));
+    g_object_unref (layout->layout);
     g_free (layout);
 }
 
diff --git a/test-display.c b/test-display.c
index f441d59..be469c5 100644
--- a/test-display.c
+++ b/test-display.c
@@ -76,17 +76,17 @@ pixbuf_from_data_with_size_data (const guchar * buff,
     rsvg_handle_set_base_uri (handle, base_uri);
 
     if (!rsvg_handle_write (handle, buff, len, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
     if (!rsvg_handle_close (handle, error)) {
-        g_object_unref (G_OBJECT (handle));
+        g_object_unref (handle);
         return NULL;
     }
 
     retval = rsvg_handle_get_pixbuf_sub (handle, id);
-    g_object_unref (G_OBJECT (handle));
+    g_object_unref (handle);
 
     return retval;
 }
@@ -121,7 +121,7 @@ zoom_image (ViewerCbInfo * info, gint width, gint height)
     gtk_image_set_from_pixbuf (GTK_IMAGE (info->image), info->pixbuf);
 
     if (save_pixbuf)
-        g_object_unref (G_OBJECT (save_pixbuf));
+        g_object_unref (save_pixbuf);
 }
 
 static void
@@ -165,14 +165,14 @@ rsvg_window_set_default_icon (GtkWindow * window, GdkPixbuf * src)
 
         icon = gdk_pixbuf_scale_simple (src, width, height, GDK_INTERP_BILINEAR);
     } else {
-        icon = g_object_ref (G_OBJECT (src));
+        icon = g_object_ref (src);
     }
 
     list = g_list_prepend (NULL, icon);
     gtk_window_set_icon_list (window, list);
     g_list_free (list);
 
-    g_object_unref (G_OBJECT (icon));
+    g_object_unref (icon);
 }
 
 #if GTK_CHECK_VERSION(2,10,0)
@@ -529,11 +529,11 @@ populate_window (GtkWidget * win, ViewerCbInfo * info, int xid, gint win_width,
 
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, 0);
-        g_signal_connect (G_OBJECT (toolitem), "clicked", G_CALLBACK (zoom_in), info);
+        g_signal_connect (toolitem, "clicked", G_CALLBACK (zoom_in), info);
 
         toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_OUT);
         gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, 1);
-        g_signal_connect (G_OBJECT (toolitem), "clicked", G_CALLBACK (zoom_out), info);
+        g_signal_connect (toolitem, "clicked", G_CALLBACK (zoom_out), info);
 
 		gtk_widget_size_request(toolbar, &requisition);
 
@@ -604,8 +604,8 @@ view_pixbuf (ViewerCbInfo * info, int xid, const char *color)
     rsvg_window_set_default_icon (GTK_WINDOW (win), info->pixbuf);
 
     /* exit when 'X' is clicked */
-    g_signal_connect (G_OBJECT (win), "destroy", G_CALLBACK (quit_cb), NULL);
-    g_signal_connect (G_OBJECT (win), "delete_event", G_CALLBACK (quit_cb), NULL);
+    g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), NULL);
+    g_signal_connect (win, "delete_event", G_CALLBACK (quit_cb), NULL);
 
     if (color && strcmp (color, "none") != 0) {
         if (gdk_color_parse (color, &bg_color)) {
@@ -625,7 +625,7 @@ view_pixbuf (ViewerCbInfo * info, int xid, const char *color)
     info->window = win;
     gtk_window_add_accel_group (GTK_WINDOW (win), info->accel_group);
 
-    g_signal_connect (G_OBJECT (win), "button-press-event", G_CALLBACK (button_press_event), info);
+    g_signal_connect (win, "button-press-event", G_CALLBACK (button_press_event), info);
 
     gtk_widget_show_all (win);
 
@@ -818,7 +818,7 @@ main (int argc, char **argv)
     /* run the gtk+ main loop */
     gtk_main ();
 
-    g_object_unref (G_OBJECT (info.pixbuf));
+    g_object_unref (info.pixbuf);
     g_byte_array_free (info.svg_bytes, TRUE);
     rsvg_term ();
 
diff --git a/tests/rsvg-test.c b/tests/rsvg-test.c
index 0586131..b0d9f98 100644
--- a/tests/rsvg-test.c
+++ b/tests/rsvg-test.c
@@ -319,7 +319,7 @@ rsvg_cairo_check (char const *test_name, gboolean xfail)
     cairo_surface_destroy (surface_b);
     cairo_destroy (cr);
 
-    g_object_unref (G_OBJECT (rsvg));
+    g_object_unref (rsvg);
 
     if (status == RSVG_TEST_FAILURE) {
 	rsvg_test_html ("<tr>");
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]