diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2018-09-08 23:54:47 +0300 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2018-09-09 00:02:41 +0300 |
| commit | 13a4a9a5c2badae9d18b9b437573be5c65b772d7 (patch) | |
| tree | cf99e7a39832cbaad161440682485b498947e60a /gvc-channel-map.c | |
| parent | 3f30a641ef292de15dedc55b89c7742a4aa358ff (diff) | |
| download | libgnome-volume-control-13a4a9a5c2badae9d18b9b437573be5c65b772d7.tar.gz | |
avoid deprecated g_type_class_add_private
Diffstat (limited to 'gvc-channel-map.c')
| -rw-r--r-- | gvc-channel-map.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gvc-channel-map.c b/gvc-channel-map.c index b37fe17..bf4d737 100644 --- a/gvc-channel-map.c +++ b/gvc-channel-map.c @@ -32,8 +32,6 @@ #include "gvc-channel-map.h" #include "gvc-channel-map-private.h" -#define GVC_CHANNEL_MAP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_CHANNEL_MAP, GvcChannelMapPrivate)) - struct GvcChannelMapPrivate { pa_channel_map pa_map; @@ -53,7 +51,7 @@ static guint signals [LAST_SIGNAL] = { 0, }; static void gvc_channel_map_finalize (GObject *object); -G_DEFINE_TYPE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GvcChannelMap, gvc_channel_map, G_TYPE_OBJECT) guint gvc_channel_map_get_num_channels (const GvcChannelMap *map) @@ -171,8 +169,6 @@ gvc_channel_map_class_init (GvcChannelMapClass *klass) NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - - g_type_class_add_private (klass, sizeof (GvcChannelMapPrivate)); } void @@ -199,7 +195,7 @@ gvc_channel_map_volume_changed (GvcChannelMap *map, static void gvc_channel_map_init (GvcChannelMap *map) { - map->priv = GVC_CHANNEL_MAP_GET_PRIVATE (map); + map->priv = gvc_channel_map_get_instance_private (map); map->priv->pa_volume_is_set = FALSE; } |