diff options
| author | Michael Biebl <biebl@debian.org> | 2011-05-04 21:35:41 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-05-04 21:35:41 +0200 |
| commit | 9f806e97a24bba61417ae312fcc0da40914266fb (patch) | |
| tree | 4a25723414ceac11b4cba0558aa16f6f4b459f4b /src/nm-device-interface.c | |
| parent | 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (diff) | |
Imported Upstream version 0.8.999 upstream/0.8.999
Diffstat (limited to 'src/nm-device-interface.c')
| -rw-r--r-- | src/nm-device-interface.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nm-device-interface.c b/src/nm-device-interface.c index eb0e009e..6d2b8762 100644 --- a/src/nm-device-interface.c +++ b/src/nm-device-interface.c @@ -302,7 +302,6 @@ nm_device_interface_activate (NMDeviceInterface *device, { gboolean success; NMConnection *connection; - NMSettingConnection *s_con; char *iface; g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), FALSE); @@ -310,12 +309,10 @@ nm_device_interface_activate (NMDeviceInterface *device, connection = nm_act_request_get_connection (req); g_assert (connection); - s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION)); - g_assert (s_con); iface = nm_device_interface_get_iface (device); nm_log_info (LOGD_DEVICE, "Activation (%s) starting connection '%s'", iface, - nm_setting_connection_get_id (s_con)); + nm_connection_get_id (connection)); g_free (iface); success = NM_DEVICE_INTERFACE_GET_INTERFACE (device)->activate (device, req, error); |