diff options
| author | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-07-06 02:16:10 +0200 |
| commit | 33491bc4279481db8ae47213e34a6d695a0e8830 (patch) | |
| tree | 097d2b0fdff3fae6885381ae5e57a182cd8cbbba /libnm-glib/nm-device-adsl.c | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Imported Upstream version 0.9.10.0 upstream/0.9.10.0
Diffstat (limited to 'libnm-glib/nm-device-adsl.c')
| -rw-r--r-- | libnm-glib/nm-device-adsl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c index bef3ceae..b3f9691e 100644 --- a/libnm-glib/nm-device-adsl.c +++ b/libnm-glib/nm-device-adsl.c @@ -46,7 +46,6 @@ enum { PROP_CARRIER, LAST_PROP }; -#define DBUS_PROP_CARRIER "Carrier" /** * nm_device_adsl_error_quark: @@ -131,7 +130,13 @@ connection_compatible (NMDevice *device, NMConnection *connection, GError **erro return FALSE; } - return TRUE; + return NM_DEVICE_CLASS (nm_device_adsl_parent_class)->connection_compatible (device, connection, error); +} + +static GType +get_setting_type (NMDevice *device) +{ + return NM_TYPE_SETTING_ADSL; } /******************************************************************/ @@ -159,17 +164,11 @@ register_properties (NMDeviceAdsl *device) static void constructed (GObject *object) { - NMDeviceAdslPrivate *priv; + NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (object); G_OBJECT_CLASS (nm_device_adsl_parent_class)->constructed (object); - priv = NM_DEVICE_ADSL_GET_PRIVATE (object); - - priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (NM_OBJECT (object)), - NM_DBUS_SERVICE, - nm_object_get_path (NM_OBJECT (object)), - NM_DBUS_INTERFACE_DEVICE_ADSL); - + priv->proxy = _nm_object_new_proxy (NM_OBJECT (object), NULL, NM_DBUS_INTERFACE_DEVICE_ADSL); register_properties (NM_DEVICE_ADSL (object)); } @@ -228,6 +227,7 @@ nm_device_adsl_class_init (NMDeviceAdslClass *adsl_class) object_class->finalize = finalize; object_class->get_property = get_property; device_class->connection_compatible = connection_compatible; + device_class->get_setting_type = get_setting_type; /* properties */ /** |