diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-11 00:29:58 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-06-24 14:18:01 +0100 |
| commit | 32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d (patch) | |
| tree | 3caf429cb269a3046af9512dbd7b9bee94381e6a /gio/gsimpleactiongroup.c | |
| parent | aba80eea6c2965ee253a675610bd31c3dc256419 (diff) | |
| download | glib-32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d.tar.gz | |
gio: Use the new private instance data declaration
Use the newly added macros, and remove the explicit calls to
g_type_class_add_private().
https://bugzilla.gnome.org/show_bug.cgi?id=700035
Diffstat (limited to 'gio/gsimpleactiongroup.c')
| -rw-r--r-- | gio/gsimpleactiongroup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gio/gsimpleactiongroup.c b/gio/gsimpleactiongroup.c index b4e422ac0..ff549aafb 100644 --- a/gio/gsimpleactiongroup.c +++ b/gio/gsimpleactiongroup.c @@ -45,6 +45,7 @@ static void g_simple_action_group_iface_init (GActionGroupInterface *); static void g_simple_action_group_map_iface_init (GActionMapInterface *); G_DEFINE_TYPE_WITH_CODE (GSimpleActionGroup, g_simple_action_group, G_TYPE_OBJECT, + G_ADD_PRIVATE (GSimpleActionGroup) G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP, g_simple_action_group_iface_init); G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_MAP, @@ -251,9 +252,7 @@ g_simple_action_group_finalize (GObject *object) static void g_simple_action_group_init (GSimpleActionGroup *simple) { - simple->priv = G_TYPE_INSTANCE_GET_PRIVATE (simple, - G_TYPE_SIMPLE_ACTION_GROUP, - GSimpleActionGroupPrivate); + simple->priv = g_simple_action_group_get_private (simple); simple->priv->table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); } @@ -264,8 +263,6 @@ g_simple_action_group_class_init (GSimpleActionGroupClass *class) GObjectClass *object_class = G_OBJECT_CLASS (class); object_class->finalize = g_simple_action_group_finalize; - - g_type_class_add_private (class, sizeof (GSimpleActionGroupPrivate)); } static void |