summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2013-06-10 22:23:51 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2013-06-19 20:45:19 +0100
commit71ccef6112f6c954dc5766788ad0aaddef05d862 (patch)
treeac1e5eac9cf2cc2c739f6ca62fc0de2fdae2ec82
parentabcb301c27110c19cf7e7a09120d8f34bc43f35b (diff)
downloadglib-wip/private-rework-3.tar.gz
Deprecate g_type_class_add_private()wip/private-rework-3
We have a new set of macros for adding private data structures to instances of a new type. https://bugzilla.gnome.org/show_bug.cgi?id=700035
-rw-r--r--gobject/gtype.c4
-rw-r--r--gobject/gtype.h2
-rw-r--r--gobject/tests/private.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 23f503d6e..99d7426ab 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -4473,6 +4473,10 @@ gobject_init_ctor (void)
* ]|
*
* Since: 2.4
+ *
+ * Deprecated: 2.38: Use the G_ADD_PRIVATE() macro when defining the type using
+ * the G_DEFINE_TYPE_WITH_CODE() macro, or use G_DEFINE_TYPE_WITH_PRIVATE()
+ * instead.
*/
void
g_type_class_add_private (gpointer g_class,
diff --git a/gobject/gtype.h b/gobject/gtype.h
index c21936d30..32221e249 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -1281,7 +1281,7 @@ void g_type_interface_add_prerequisite (GType interface_type,
GLIB_AVAILABLE_IN_ALL
GType*g_type_interface_prerequisites (GType interface_type,
guint *n_prerequisites);
-GLIB_AVAILABLE_IN_ALL
+GLIB_DEPRECATED_IN_2_38_FOR (Use the G_ADD_PRIVATE macro instead)
void g_type_class_add_private (gpointer g_class,
gsize private_size);
GLIB_AVAILABLE_IN_2_38
diff --git a/gobject/tests/private.c b/gobject/tests/private.c
index 9a1026255..6b99c4c5c 100644
--- a/gobject/tests/private.c
+++ b/gobject/tests/private.c
@@ -123,11 +123,13 @@ GType test_mixed_get_type (void);
G_DEFINE_TYPE (TestMixed, test_mixed, test_object_get_type ())
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static void
test_mixed_class_init (TestMixedClass *klass)
{
g_type_class_add_private (klass, sizeof (TestMixedPrivate));
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static void
test_mixed_init (TestMixed *self)