[gdk-pixbuf] Use G_DEFINE_BOXED_TYPE
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] Use G_DEFINE_BOXED_TYPE
- Date: Fri, 5 Nov 2010 23:34:25 +0000 (UTC)
commit e76b2118b5c45ce889995dfd8f6434eaa332b204
Author: Christian Persch <chpe gnome org>
Date: Wed Aug 18 00:28:28 2010 +0200
Use G_DEFINE_BOXED_TYPE
Bug #627215.
configure.ac | 2 +-
gdk-pixbuf/gdk-pixbuf-io.c | 16 +++-------------
2 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9480bdf..a8b60d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_define([gdk_pixbuf_binary_version], [2.10.0])
# required versions of other packages
-m4_define([glib_required_version], [2.25.9])
+m4_define([glib_required_version], [2.25.15])
AC_INIT([gdk-pixbuf], [gdk_pixbuf_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf],
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 9962ed6..d9d4c8e 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -2708,16 +2708,6 @@ gdk_pixbuf_format_free (GdkPixbufFormat *format)
g_slice_free (GdkPixbufFormat, format);
}
-GType
-gdk_pixbuf_format_get_type (void)
-{
- static volatile gsize format_id__volatile = 0;
- if (g_once_init_enter (&format_id__volatile)) {
- GType format_id =
- g_boxed_type_register_static (g_intern_static_string ("GdkPixbufFormat"),
- (GBoxedCopyFunc) gdk_pixbuf_format_copy,
- (GBoxedFreeFunc) gdk_pixbuf_format_free);
- g_once_init_leave (&format_id__volatile, format_id);
- }
- return format_id__volatile;
-}
+G_DEFINE_BOXED_TYPE (GdkPixbufFormat, gdk_pixbuf_format,
+ gdk_pixbuf_format_copy,
+ gdk_pixbuf_format_free)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]