about summary refs log tree commit diff
path: root/src/nm-device-interface.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-04-21 10:42:53 +0200
committerMichael Biebl <biebl@debian.org>2011-04-21 10:42:53 +0200
commit8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (patch)
treea9ac1e67d0c22a48330c76f08fc5291f85307055 /src/nm-device-interface.c
parentf75dd6fd1975146623052b843b182dc32c3fbe46 (diff)
Imported Upstream version 0.8.4.0 upstream/0.8.4.0
Diffstat (limited to 'src/nm-device-interface.c')
-rw-r--r--src/nm-device-interface.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nm-device-interface.c b/src/nm-device-interface.c
index 6d2b8762..eb0e009e 100644
--- a/src/nm-device-interface.c
+++ b/src/nm-device-interface.c
@@ -302,6 +302,7 @@ 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);
@@ -309,10 +310,12 @@ 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_connection_get_id (connection));
+			     nm_setting_connection_get_id (s_con));
 	g_free (iface);
 
 	success = NM_DEVICE_INTERFACE_GET_INTERFACE (device)->activate (device, req, error);