colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-03-12 Dan Williams <dcbw@redhat.com>

Browse Source 
* 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
This commit is contained in:
Dan Williams
2008-03-12 18:31:00 +00:00
parent 324e863903
commit c9315b44e9
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2008-03-12 Dan Williams <dcbw@redhat.com>
* 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 <dcbw@redhat.com> 2008-03-12 Dan Williams <dcbw@redhat.com>
Harmonize the 802.11 bitrate API Harmonize the 802.11 bitrate API

10
src/nm-device-interface.c
View File

@@ -1,5 +1,6 @@
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */ /* -*- 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-device-interface.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -196,11 +197,18 @@ nm_device_interface_activate (NMDeviceInterface *device,
GError **error) GError **error)
{ {
gboolean success; 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_DEVICE_INTERFACE (device), FALSE);
g_return_val_if_fail (NM_IS_ACT_REQUEST (req), 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); success = NM_DEVICE_INTERFACE_GET_INTERFACE (device)->activate (device, req, error);
if (!success) if (!success)
g_assert (*error); g_assert (*error);