From df02fa1e4cc61a2c7f3aafdf1a6534a831f1c0d6 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 15 Oct 2012 12:01:01 -0400 Subject: [PATCH] Properly deprecate g_type_init() Now that all internal users of it are gone. https://bugzilla.gnome.org/show_bug.cgi?id=686161 --- gobject/gtype.c | 4 ++++ gobject/gtype.h | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gobject/gtype.c b/gobject/gtype.c index 75ba044e..15a47a1 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -4261,6 +4261,8 @@ _g_type_boxed_init (GType type, * * If you need to enable debugging features, use the GOBJECT_DEBUG * environment variable. + * + * Deprecated: 2.36: the type system is now initialised automatically */ void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) @@ -4277,6 +4279,8 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) * This function used to initialise the type system. Since GLib 2.36, * the type system is initialised automatically and this function does * nothing. + * + * Deprecated: 2.36: the type system is now initialised automatically */ void g_type_init (void) diff --git a/gobject/gtype.h b/gobject/gtype.h index f2c4f08..80a4ddf 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -646,12 +646,14 @@ struct _GTypeQuery * @G_TYPE_DEBUG_OBJECTS: Print messages about object bookkeeping. * @G_TYPE_DEBUG_SIGNALS: Print messages about signal emissions. * @G_TYPE_DEBUG_MASK: Mask covering all debug flags. - * - * The GTypeDebugFlags enumeration values can be passed to - * g_type_init_with_debug_flags() to trigger debugging messages during runtime. - * Note that the messages can also be triggered by setting the - * GOBJECT_DEBUG environment variable to a ':'-separated list of - * "objects" and "signals". + * + * These flags used to be passed to g_type_init_with_debug_flags() which + * is now deprecated. + * + * If you need to enable debugging features, use the GOBJECT_DEBUG + * environment variable. + * + * Deprecated: 2.36: g_type_init() is now done automatically */ typedef enum /*< skip >*/ { @@ -663,7 +665,9 @@ typedef enum /*< skip >*/ /* --- prototypes --- */ +GLIB_DEPRECATED_IN_2_36 void g_type_init (void); +GLIB_DEPRECATED_IN_2_36 void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags); const gchar * g_type_name (GType type); GQuark g_type_qname (GType type); -- 2.7.4