From f571f74616864cd0955ad42a9c905b7d7b358094 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 29 Jun 2001 02:50:46 +0000 Subject: [PATCH] Remove debug flag argument to g_type_init() and add Thu Jun 28 22:49:40 2001 Owen Taylor * gtype.[ch] gobject-query.c testgruntime.c: Remove debug flag argument to g_type_init() and add g_type_init_with_debug_flags(). --- docs/reference/gobject/tmpl/types.sgml | 1 + gobject/ChangeLog | 6 ++++++ gobject/gobject-query.c | 2 +- gobject/gtype.c | 8 +++++++- gobject/gtype.h | 3 ++- gobject/testgobject.c | 2 +- gobject/testgruntime.c | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/docs/reference/gobject/tmpl/types.sgml b/docs/reference/gobject/tmpl/types.sgml index 67d845e10..6aac8d6e8 100644 --- a/docs/reference/gobject/tmpl/types.sgml +++ b/docs/reference/gobject/tmpl/types.sgml @@ -401,6 +401,7 @@ the type system and assorted other code portions (such as the various fundamenta type implementations or the signal system). + @debug_flags: Bitwise combination of #GTypeDebugFlags values for debugging purposes. diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 64f1c7991..dcd0a3fae 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 28 22:49:40 2001 Owen Taylor + + * gtype.[ch] gobject-query.c testgruntime.c: Remove + debug flag argument to g_type_init() and add + g_type_init_with_debug_flags(). + Thu Jun 28 16:42:49 2001 Tim Janik * gsignal.c (g_signal_lookup): diff --git a/gobject/gobject-query.c b/gobject/gobject-query.c index 39b645f96..652d09acd 100644 --- a/gobject/gobject-query.c +++ b/gobject/gobject-query.c @@ -133,7 +133,7 @@ main (gint argc, root = G_TYPE_OBJECT; - g_type_init (0); + g_type_init (); for (i = 1; i < argc; i++) { diff --git a/gobject/gtype.c b/gobject/gtype.c index 50edc4582..e13330f85 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -2769,7 +2769,7 @@ extern void g_signal_init (void); /* sync with gsignal.c */ /* --- initialization --- */ void -g_type_init (GTypeDebugFlags debug_flags) +g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) { G_LOCK_DEFINE_STATIC (type_init_lock); static TypeNode *type0_node = NULL; @@ -2875,3 +2875,9 @@ g_type_init (GTypeDebugFlags debug_flags) G_UNLOCK (type_init_lock); } + +void +g_type_init (void) +{ + g_type_init_with_debug_flags (0); +} diff --git a/gobject/gtype.h b/gobject/gtype.h index 07daee580..9e85d9113 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -182,7 +182,8 @@ typedef enum /*< skip >*/ /* --- prototypes --- */ -void g_type_init (GTypeDebugFlags debug_flags); +void g_type_init (void); +void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags); G_CONST_RETURN gchar* g_type_name (GType type); GQuark g_type_qname (GType type); GType g_type_from_name (const gchar *name); diff --git a/gobject/testgobject.c b/gobject/testgobject.c index 0ccb801d6..5e8d1a2c4 100644 --- a/gobject/testgobject.c +++ b/gobject/testgobject.c @@ -167,7 +167,7 @@ main (int argc, g_log_set_always_fatal (g_log_set_always_fatal (G_LOG_FATAL_MASK) | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL); - g_type_init (G_TYPE_DEBUG_OBJECTS | G_TYPE_DEBUG_SIGNALS); + g_type_init_with_debug_flags (G_TYPE_DEBUG_OBJECTS | G_TYPE_DEBUG_SIGNALS); tobject = g_object_new (TEST_TYPE_OBJECT, NULL); sigarg = g_object_new (TEST_TYPE_OBJECT, NULL); diff --git a/gobject/testgruntime.c b/gobject/testgruntime.c index 0ccb801d6..5e8d1a2c4 100644 --- a/gobject/testgruntime.c +++ b/gobject/testgruntime.c @@ -167,7 +167,7 @@ main (int argc, g_log_set_always_fatal (g_log_set_always_fatal (G_LOG_FATAL_MASK) | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL); - g_type_init (G_TYPE_DEBUG_OBJECTS | G_TYPE_DEBUG_SIGNALS); + g_type_init_with_debug_flags (G_TYPE_DEBUG_OBJECTS | G_TYPE_DEBUG_SIGNALS); tobject = g_object_new (TEST_TYPE_OBJECT, NULL); sigarg = g_object_new (TEST_TYPE_OBJECT, NULL);