diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-11-08 13:29:18 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-11-09 10:07:21 +0100 |
| commit | b04141df0d0e18f8ea5d08e638df5c75940d4923 (patch) | |
| tree | 19d141867e44bb8f07c9b304ea42731d43106965 | |
| parent | 476dff925d91629147b1c3e31aefa24cd804a4f2 (diff) | |
| download | NetworkManager-bg/libnm-checkpoint-rh1496739.tar.gz | |
fixup! libnm: add checkpoint supportbg/libnm-checkpoint-rh1496739
Don't implement private data GObject-style.
| -rw-r--r-- | libnm/nm-checkpoint.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c index bfb9fc0df6..264c819538 100644 --- a/libnm/nm-checkpoint.c +++ b/libnm/nm-checkpoint.c @@ -20,8 +20,15 @@ #include "nm-device.h" #include "nm-object-private.h" +typedef struct { + GPtrArray *devices; + gint64 created; + guint32 rollback_timeout; +} NMCheckpointPrivate; + struct _NMCheckpoint { NMObject parent; + NMCheckpointPrivate _priv; }; struct _NMCheckpointClass { @@ -30,13 +37,7 @@ struct _NMCheckpointClass { G_DEFINE_TYPE (NMCheckpoint, nm_checkpoint, NM_TYPE_OBJECT) -#define NM_CHECKPOINT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_CHECKPOINT, NMCheckpointPrivate)) - -typedef struct { - GPtrArray *devices; - gint64 created; - guint32 rollback_timeout; -} NMCheckpointPrivate; +#define NM_CHECKPOINT_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMCheckpoint, NM_IS_CHECKPOINT) enum { PROP_0, @@ -112,7 +113,7 @@ nm_checkpoint_init (NMCheckpoint *checkpoint) static void finalize (GObject *object) { - NMCheckpointPrivate *priv = NM_CHECKPOINT_GET_PRIVATE (object); + NMCheckpointPrivate *priv = NM_CHECKPOINT_GET_PRIVATE (NM_CHECKPOINT (object)); g_ptr_array_unref (priv->devices); @@ -147,7 +148,7 @@ get_property (GObject *object, static void init_dbus (NMObject *object) { - NMCheckpointPrivate *priv = NM_CHECKPOINT_GET_PRIVATE (object); + NMCheckpointPrivate *priv = NM_CHECKPOINT_GET_PRIVATE (NM_CHECKPOINT (object)); const NMPropertiesInfo property_info[] = { { NM_CHECKPOINT_DEVICES, &priv->devices, NULL, NM_TYPE_DEVICE }, { NM_CHECKPOINT_CREATED, &priv->created }, @@ -169,8 +170,6 @@ nm_checkpoint_class_init (NMCheckpointClass *checkpoint_class) GObjectClass *object_class = G_OBJECT_CLASS (checkpoint_class); NMObjectClass *nm_object_class = NM_OBJECT_CLASS (checkpoint_class); - g_type_class_add_private (checkpoint_class, sizeof (NMCheckpointPrivate)); - object_class->get_property = get_property; object_class->finalize = finalize; |