diff options
Diffstat (limited to 'src/nm-dhcp4-config.c')
| -rw-r--r-- | src/nm-dhcp4-config.c | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c index 567ba687..a405aa87 100644 --- a/src/nm-dhcp4-config.c +++ b/src/nm-dhcp4-config.c @@ -26,7 +26,6 @@ #include "nm-dhcp4-config.h" #include "nm-dhcp4-config-glue.h" #include "nm-dbus-glib-types.h" -#include "nm-properties-changed-signal.h" #include "nm-utils.h" @@ -47,14 +46,6 @@ enum { LAST_PROP }; -enum { - PROPERTIES_CHANGED, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - NMDHCP4Config * nm_dhcp4_config_new (void) @@ -140,14 +131,9 @@ nm_dhcp4_config_init (NMDHCP4Config *self) { NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (self); static guint32 counter = 0; - DBusGConnection *connection; - NMDBusManager *dbus_mgr; - dbus_mgr = nm_dbus_manager_get (); - connection = nm_dbus_manager_get_connection (dbus_mgr); priv->dbus_path = g_strdup_printf (NM_DBUS_PATH "/DHCP4Config/%d", counter++); - dbus_g_connection_register_g_object (connection, priv->dbus_path, G_OBJECT (self)); - g_object_unref (dbus_mgr); + nm_dbus_manager_register_object (nm_dbus_manager_get (), priv->dbus_path, self); priv->options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, nm_gvalue_destroy); } @@ -199,11 +185,7 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) DBUS_TYPE_G_MAP_OF_VARIANT, G_PARAM_READABLE)); - /* Signals */ - signals[PROPERTIES_CHANGED] = - nm_properties_changed_signal_new (object_class, - G_STRUCT_OFFSET (NMDHCP4ConfigClass, properties_changed)); - - dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (config_class), - &dbus_glib_nm_dhcp4_config_object_info); + nm_dbus_manager_register_exported_type (nm_dbus_manager_get (), + G_TYPE_FROM_CLASS (config_class), + &dbus_glib_nm_dhcp4_config_object_info); } |