diff --git a/gobject/gboxed.h b/gobject/gboxed.h index d89814060..931f32198 100644 --- a/gobject/gboxed.h +++ b/gobject/gboxed.h @@ -78,11 +78,9 @@ void g_value_set_static_boxed (GValue *value, gconstpointer v_boxed); void g_value_take_boxed (GValue *value, gconstpointer v_boxed); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_value_take_boxed) void g_value_set_boxed_take_ownership (GValue *value, gconstpointer v_boxed); -#endif gpointer g_value_get_boxed (const GValue *value); gpointer g_value_dup_boxed (const GValue *value); diff --git a/gobject/glib-types.h b/gobject/glib-types.h index 1c98453bb..c37c96549 100644 --- a/gobject/glib-types.h +++ b/gobject/glib-types.h @@ -238,9 +238,8 @@ GType g_main_loop_get_type (void) G_GNUC_CONST; GType g_main_context_get_type (void) G_GNUC_CONST; GType g_source_get_type (void) G_GNUC_CONST; -#if !defined(G_DISABLE_DEPRECATED) || defined(__GI_SCANNER__) +GLIB_DEPRECATED_FOR(G_TYPE_VARIANT) GType g_variant_get_gtype (void) G_GNUC_CONST; -#endif /** * GStrv: diff --git a/gobject/gobject.h b/gobject/gobject.h index 277001f03..ea3b048ab 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -526,16 +526,13 @@ void g_object_run_dispose (GObject *object); void g_value_take_object (GValue *value, gpointer v_object); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_value_take_object) void g_value_set_object_take_ownership (GValue *value, gpointer v_object); -#endif -#if !defined(G_DISABLE_DEPRECATED) || defined(GTK_COMPILATION) +GLIB_DEPRECATED gsize g_object_compat_control (gsize what, gpointer data); -#endif /* --- implementation macros --- */ #define G_OBJECT_WARN_INVALID_PSPEC(object, pname, property_id, pspec) \ diff --git a/gobject/gparam.h b/gobject/gparam.h index cc7352b90..835747781 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -312,11 +312,9 @@ GParamSpec* g_value_dup_param (const GValue *value); void g_value_take_param (GValue *value, GParamSpec *param); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_value_take_param) void g_value_set_param_take_ownership (GValue *value, GParamSpec *param); -#endif /* --- convenience functions --- */ typedef struct _GParamSpecTypeInfo GParamSpecTypeInfo; diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h index 6ec61d554..cb934f1a8 100644 --- a/gobject/gvaluetypes.h +++ b/gobject/gvaluetypes.h @@ -177,12 +177,11 @@ G_BEGIN_DECLS /* --- prototypes --- */ -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED void g_value_set_char (GValue *value, gchar v_char); -GLIB_DEPRECATED gchar g_value_get_char (const GValue *value); -#endif +GLIB_DEPRECATED +gchar g_value_get_char (const GValue *value); void g_value_set_schar (GValue *value, gint8 v_char); gint8 g_value_get_schar (const GValue *value); @@ -246,11 +245,9 @@ gchar* g_strdup_value_contents (const GValue *value); void g_value_take_string (GValue *value, gchar *v_string); -#ifndef G_DISABLE_DEPRECATED GLIB_DEPRECATED_FOR(g_value_take_string) void g_value_set_string_take_ownership (GValue *value, gchar *v_string); -#endif /* humpf, need a C representable type name for G_TYPE_STRING */