diff options
| author | Dan Winship <danw@gnome.org> | 2014-05-15 14:24:56 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:40 -0400 |
| commit | 8ca2998d81ca7534c59262b10f5bf3c480177b88 (patch) | |
| tree | 964e32c42f1e8358fffe09b163bc2cb87963df4e /libnm/nm-ip4-config.c | |
| parent | a0e9a4bd45f25548f1fe580ddaf96ca6ff567721 (diff) | |
| download | NetworkManager-8ca2998d81ca7534c59262b10f5bf3c480177b88.tar.gz | |
libnm: add init_dbus() virtual method to NMObject
Rather than having each object type override constructed() to call
_nm_object_register_properties(), have NMObject call a virtual method
on the subclass to ask it to register them.
Move some code around in nm-client.c and nm-object.c so that all
D-Bus-related initialization happens in init_dbus(), and
non-D-Bus-related stuff stays in construct().
(This simplifies the next commit.)
Diffstat (limited to 'libnm/nm-ip4-config.c')
| -rw-r--r-- | libnm/nm-ip4-config.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c index 205a590438..727e2a6b30 100644 --- a/libnm/nm-ip4-config.c +++ b/libnm/nm-ip4-config.c @@ -115,9 +115,9 @@ demarshal_ip4_routes_array (NMObject *object, GParamSpec *pspec, GValue *value, } static void -register_properties (NMIP4Config *config) +init_dbus (NMObject *object) { - NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config); + NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object); const NMPropertiesInfo property_info[] = { { NM_IP4_CONFIG_GATEWAY, &priv->gateway, }, { NM_IP4_CONFIG_ADDRESSES, &priv->addresses, demarshal_ip4_address_array }, @@ -129,23 +129,15 @@ register_properties (NMIP4Config *config) { NULL }, }; - _nm_object_register_properties (NM_OBJECT (config), + NM_OBJECT_CLASS (nm_ip4_config_parent_class)->init_dbus (object); + + priv->proxy = _nm_object_new_proxy (object, NULL, NM_DBUS_INTERFACE_IP4_CONFIG); + _nm_object_register_properties (object, priv->proxy, property_info); } static void -constructed (GObject *object) -{ - NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object); - - G_OBJECT_CLASS (nm_ip4_config_parent_class)->constructed (object); - - priv->proxy = _nm_object_new_proxy (NM_OBJECT (object), NULL, NM_DBUS_INTERFACE_IP4_CONFIG); - register_properties (NM_IP4_CONFIG (object)); -} - -static void finalize (GObject *object) { NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (object); @@ -219,14 +211,16 @@ static void nm_ip4_config_class_init (NMIP4ConfigClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); + NMObjectClass *nm_object_class = NM_OBJECT_CLASS (config_class); g_type_class_add_private (config_class, sizeof (NMIP4ConfigPrivate)); /* virtual methods */ - object_class->constructed = constructed; object_class->get_property = get_property; object_class->finalize = finalize; + nm_object_class->init_dbus = init_dbus; + /* properties */ /** |