From 68eaeb69cbaeca3ddbd1f25cc85a303e6486aced Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 23 Apr 2006 04:21:08 +0000 Subject: [PATCH] Fix some problems with my last commit --- gobject/ChangeLog | 9 +++++++++ gobject/gobject.symbols | 2 +- gobject/gtype.c | 2 +- gobject/gtype.h | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 62f6607..521ddde 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,12 @@ +2006-04-23 Matthias Clasen + + * gobject.symbols: Fix a typo. + + * gtype.c: (g_type_register_static_simple): Add a + missing return. + + * gtype.h: Silence warnings from G_DEFINE_TYPE. + 2006-04-21 Matthias Clasen * gobject.symbols: diff --git a/gobject/gobject.symbols b/gobject/gobject.symbols index 24db318..d723459 100644 --- a/gobject/gobject.symbols +++ b/gobject/gobject.symbols @@ -16,7 +16,6 @@ g_boxed_copy g_boxed_free g_boxed_type_register_static -g_boxed_type_register_static_simple g_date_get_type G_GNUC_CONST g_gstring_get_type G_GNUC_CONST g_strv_get_type G_GNUC_CONST @@ -365,6 +364,7 @@ g_type_query g_type_register_dynamic g_type_register_fundamental g_type_register_static +g_type_register_static_simple g_type_remove_class_cache_func g_type_remove_interface_check g_type_set_qdata diff --git a/gobject/gtype.c b/gobject/gtype.c index 45d7590..acc94ef 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -2225,7 +2225,7 @@ g_type_register_static_simple (GType parent_type, info.instance_init = instance_init; info.value_table = NULL; - g_type_register_static (parent_type, type_name, &info, flags); + return g_type_register_static (parent_type, type_name, &info, flags); } GType diff --git a/gobject/gtype.h b/gobject/gtype.h index 538d641..828aebc 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -374,9 +374,9 @@ type_name##_get_type (void) \ g_type_register_static_simple (TYPE_PARENT, \ g_intern_static_string (#TypeName), \ sizeof (TypeName##Class), \ - type_name##_class_intern_init, \ + (GClassInitFunc)type_name##_class_intern_init, \ sizeof (TypeName), \ - type_name##_init, \ + (GInstanceInitFunc)type_name##_init, \ (GTypeFlags) flags); \ { CODE ; } \ } \ -- 2.7.4