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

2005-12-21 Dan Williams <dcbw@redhat.com>

Browse Source 
* Consolidate the info-daemon's "updateNetworkInfo" and
		"addNetworkAddress" calls into just "updateNetworkInfo"


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1224 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-12-22 00:24:11 +00:00
parent 579686533a
commit 036e35a5ca
5 changed files with 81 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/NetworkManagerPolicy.c
View File

@@ -68,15 +68,12 @@ static gboolean nm_policy_activation_finish (NMActRequest *req)
/* Cache details in the info-daemon since the connect was successful */
automatic = !nm_act_request_get_user_requested (req);
nm_dbus_update_network_info (data->dbus_connection, ap, automatic);
nm_device_get_ap_address (dev, &addr);
if (!nm_ap_get_address (ap) || !nm_ethernet_address_is_valid (nm_ap_get_address (ap)))
nm_ap_set_address (ap, &addr);
/* Don't store MAC addresses for non-infrastructure networks */
if ((nm_ap_get_mode (ap) == IW_MODE_INFRA) && nm_ethernet_address_is_valid (&addr))
nm_dbus_add_network_address (data->dbus_connection, NETWORK_TYPE_ALLOWED, nm_ap_get_essid (ap), &addr);
nm_dbus_update_network_info (data->dbus_connection, ap, automatic);
}
nm_info ("Activation (%s) successful, device activated.", nm_device_get_iface (dev));