diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-07-10 14:59:21 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-07-10 15:35:06 +0200 |
| commit | 5e276b2c92015f8c6eff42be99eafc8d54b570a7 (patch) | |
| tree | 526f74e9a72135293e46de95d29f9192ca9cf64f /daemon/gvfsmonitor.c | |
| parent | 1106ec3d4977c7eae726b7a3a09836678ff0de78 (diff) | |
| download | gvfs-5e276b2c92015f8c6eff42be99eafc8d54b570a7.tar.gz | |
daemon: Don't use deprecated private structure APIs
g_type_class_add_private and G_TYPE_INSTANCE_GET_PRIVATE have been
recently deprecated. Let's use rather G_DEFINE_TYPE_WITH_PRIVATE
and _get_instance_private() instead in order to prevent deprecation
warnings.
Diffstat (limited to 'daemon/gvfsmonitor.c')
| -rw-r--r-- | daemon/gvfsmonitor.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/daemon/gvfsmonitor.c b/daemon/gvfsmonitor.c index cdf0dc2a..b03f7fcd 100644 --- a/daemon/gvfsmonitor.c +++ b/daemon/gvfsmonitor.c @@ -62,7 +62,7 @@ struct _GVfsMonitorPrivate /* atomic */ static volatile gint path_counter = 1; -G_DEFINE_TYPE (GVfsMonitor, g_vfs_monitor, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_PRIVATE (GVfsMonitor, g_vfs_monitor, G_TYPE_OBJECT) static void unsubscribe (Subscriber *subscriber); @@ -118,8 +118,6 @@ g_vfs_monitor_class_init (GVfsMonitorClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (GVfsMonitorPrivate)); - gobject_class->finalize = g_vfs_monitor_finalize; } @@ -127,11 +125,9 @@ static void g_vfs_monitor_init (GVfsMonitor *monitor) { gint id; - - monitor->priv = G_TYPE_INSTANCE_GET_PRIVATE (monitor, - G_TYPE_VFS_MONITOR, - GVfsMonitorPrivate); - + + monitor->priv = g_vfs_monitor_get_instance_private (monitor); + id = g_atomic_int_add (&path_counter, 1); monitor->priv->object_path = g_strdup_printf (OBJ_PATH_PREFIX"%d", id); } |