From c9315b44e990b31eee38ab5cf54eab051be8ae66 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 12 Mar 2008 18:31:00 +0000 Subject: [PATCH] 2008-03-12 Dan Williams * src/nm-device-interface.c - (nm_device_interface_activate): print the ID of the connection that's about to be activated git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3434 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device-interface.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 22e9a03eee..b21b683cc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-12 Dan Williams + + * src/nm-device-interface.c + - (nm_device_interface_activate): print the ID of the connection + that's about to be activated + 2008-03-12 Dan Williams Harmonize the 802.11 bitrate API diff --git a/src/nm-device-interface.c b/src/nm-device-interface.c index 19cea3f8e1..49ae768f95 100644 --- a/src/nm-device-interface.c +++ b/src/nm-device-interface.c @@ -1,5 +1,6 @@ /* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ +#include "nm-setting-connection.h" #include "nm-device-interface.h" #include "nm-ip4-config.h" #include "nm-utils.h" @@ -196,11 +197,18 @@ nm_device_interface_activate (NMDeviceInterface *device, GError **error) { gboolean success; + NMConnection *connection; + NMSettingConnection *s_con; g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), FALSE); g_return_val_if_fail (NM_IS_ACT_REQUEST (req), FALSE); - nm_info ("Activating device %s", nm_device_interface_get_iface (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); + + nm_info ("Activation (%s) starting connection '%s'", nm_device_interface_get_iface (device), s_con->id); success = NM_DEVICE_INTERFACE_GET_INTERFACE (device)->activate (device, req, error); if (!success) g_assert (*error);