diff options
| -rw-r--r-- | gdk-pixbuf-loader/io-svg.c | 2 | ||||
| -rw-r--r-- | gtk-engine/svg-render.c | 2 | ||||
| -rw-r--r-- | rsvg-base-file-util.c | 2 | ||||
| -rw-r--r-- | rsvg-base.c | 15 | ||||
| -rw-r--r-- | rsvg-convert.c | 6 | ||||
| -rw-r--r-- | rsvg-defs.c | 2 | ||||
| -rw-r--r-- | rsvg-file-util.c | 4 | ||||
| -rw-r--r-- | rsvg-gobject.c | 13 |
8 files changed, 22 insertions, 24 deletions
diff --git a/gdk-pixbuf-loader/io-svg.c b/gdk-pixbuf-loader/io-svg.c index 8f952e37..16b0acfb 100644 --- a/gdk-pixbuf-loader/io-svg.c +++ b/gdk-pixbuf-loader/io-svg.c @@ -163,7 +163,7 @@ gdk_pixbuf__svg_image_stop_load (gpointer data, GError **error) result = FALSE; } - rsvg_handle_free (context->handle); + g_object_unref (G_OBJECT(context->handle)); g_free (context); return TRUE; diff --git a/gtk-engine/svg-render.c b/gtk-engine/svg-render.c index 117015e0..0064a0f3 100644 --- a/gtk-engine/svg-render.c +++ b/gtk-engine/svg-render.c @@ -642,7 +642,7 @@ svg_cache_value_free(gpointer foo) handle = (RsvgHandle *)foo; if(handle != NULL) - rsvg_handle_free(handle); + g_object_unref(G_OBJECT(handle)); } #define SVG_BUFFER_SIZE (1024*8) diff --git a/rsvg-base-file-util.c b/rsvg-base-file-util.c index 3f0cb0ab..3c0b7091 100644 --- a/rsvg-base-file-util.c +++ b/rsvg-base-file-util.c @@ -51,7 +51,7 @@ RsvgHandle * rsvg_handle_new_from_data (const guint8 *data, if(handle) { if(!rsvg_handle_write (handle, data, data_len, error)) { - rsvg_handle_free(handle); + g_object_unref(G_OBJECT(handle)); handle = NULL; } else { rsvg_handle_close(handle, error); diff --git a/rsvg-base.c b/rsvg-base.c index cdf0e289..0dfb4ace 100644 --- a/rsvg-base.c +++ b/rsvg-base.c @@ -1329,21 +1329,6 @@ rsvg_handle_close (RsvgHandle *handle, return rsvg_handle_close_impl (handle, error); } -/** - * rsvg_handle_free: - * @handle: An #RsvgHandle - * - * Frees #handle. - * Deprecated: Use g_object_unref() instead. - **/ -void -rsvg_handle_free (RsvgHandle *handle) -{ - g_return_if_fail(handle); - - g_object_unref (G_OBJECT (handle)); -} - #ifdef HAVE_GNOME_VFS #include <libgnomevfs/gnome-vfs.h> #endif diff --git a/rsvg-convert.c b/rsvg-convert.c index 8b9c6ca3..dbd99822 100644 --- a/rsvg-convert.c +++ b/rsvg-convert.c @@ -67,13 +67,13 @@ rsvg_handle_new_from_stdio_file (FILE * f, { if (!rsvg_handle_write (handle, buffer, length, error)) { - rsvg_handle_free (handle); + g_object_unref (G_OBJECT(handle)); return NULL; } } else if (ferror (f)) { - rsvg_handle_free (handle); + g_object_unref (G_OBJECT(handle)); return NULL; } } @@ -283,7 +283,7 @@ main (int argc, const char **argv) else cairo_show_page (cr); - rsvg_handle_free (rsvg); + g_object_unref (G_OBJECT(rsvg)); } cairo_destroy (cr); diff --git a/rsvg-defs.c b/rsvg-defs.c index 8229f312..01ae702b 100644 --- a/rsvg-defs.c +++ b/rsvg-defs.c @@ -56,7 +56,7 @@ rsvg_defs_new (void) RsvgDefs *result = g_new (RsvgDefs, 1); result->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - result->externs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)rsvg_handle_free); + result->externs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify)g_object_unref); result->unnamed = g_ptr_array_new (); result->base_uri = NULL; result->toresolve = NULL; diff --git a/rsvg-file-util.c b/rsvg-file-util.c index 25e7cd83..59ce39f2 100644 --- a/rsvg-file-util.c +++ b/rsvg-file-util.c @@ -145,7 +145,7 @@ rsvg_pixbuf_from_data_with_size_data (const guchar * buff, rsvg_handle_close (handle, error); retval = rsvg_handle_get_pixbuf (handle); - rsvg_handle_free (handle); + g_object_unref (G_OBJECT(handle)); return retval; } @@ -175,7 +175,7 @@ rsvg_pixbuf_from_stdio_file_with_size_data(GByteArray *f, rsvg_handle_close (handle, error); retval = rsvg_handle_get_pixbuf (handle); - rsvg_handle_free (handle); + g_object_unref (G_OBJECT(handle)); return retval; } diff --git a/rsvg-gobject.c b/rsvg-gobject.c index 633dbd9e..37cf5ba1 100644 --- a/rsvg-gobject.c +++ b/rsvg-gobject.c @@ -243,6 +243,19 @@ rsvg_handle_get_type (void) } /** + * rsvg_handle_free: + * @handle: An #RsvgHandle + * + * Frees #handle. + * Deprecated: Use g_object_unref() instead. + **/ +void +rsvg_handle_free (RsvgHandle *handle) +{ + g_object_unref (G_OBJECT (handle)); +} + +/** * rsvg_handle_new: * * Returns a new rsvg handle. Must be freed with @rsvg_handle_free. This |