Commit ca7c51f6 authored by Dan Williams's avatar Dan Williams
Browse files

2005-08-10 Dan Williams <dcbw@redhat.com>

	Patch from Bill Moss <bmoss@clemson.edu>
	* Consolidate writes of access point information updates to the info daemon
		so that we only do it when the connection to the access point was
		successful.  Also consolidates updates to GConf in the Gnome applet.

	* src/nm-netlink-monitor.c
		- Silence compile warning when calling g_object_new()


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@830 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent 05d9b6b4
2005-08-10 Dan Williams <dcbw@redhat.com>
Patch from Bill Moss <bmoss@clemson.edu>
* Consolidate writes of access point information updates to the info daemon
so that we only do it when the connection to the access point was
successful. Also consolidates updates to GConf in the Gnome applet.
* src/nm-netlink-monitor.c
- Silence compile warning when calling g_object_new()
2005-08-08 Dan Williams <dcbw@redhat.com>
Patch from Steev <steev@steev.net>:
......
......@@ -866,6 +866,10 @@ void nmi_save_network_info (NMWirelessApplet *applet, const char *essid, const c
gconf_client_set_int (applet->gconf_client, key, (int)enc_key_type, NULL);
g_free (key);
key = g_strdup_printf ("%s/%s/timestamp", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
gconf_client_set_int (applet->gconf_client, key, time (NULL), NULL);
g_free (key);
if (auth_method != NM_DEVICE_AUTH_METHOD_UNKNOWN)
{
key = g_strdup_printf ("%s/%s/auth_method", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
......
......@@ -217,7 +217,6 @@ static void nmi_passphrase_dialog_ok_clicked (GtkWidget *ok_button, gpointer use
/* Tell NetworkManager about the key the user typed in */
nmi_dbus_return_user_key (applet->connection, message, passphrase, key_type_return);
nmi_save_network_info (applet, wireless_network_get_essid(net), passphrase, key_type_return, NM_DEVICE_AUTH_METHOD_UNKNOWN);
nmi_passphrase_dialog_clear (dialog);
}
}
......
......@@ -2962,20 +2962,6 @@ static gboolean nm_device_activate_stage5_ip_config_commit (NMActRequest *req)
nm_device_update_ip4_address (dev);
nm_system_device_add_ip6_link_address (dev);
nm_system_restart_mdns_responder ();
if (nm_device_is_wireless (dev))
{
NMAccessPoint *ap = nm_act_request_get_ap (req);
NMAccessPoint *tmp_ap;
/* Cache details in the info-daemon since the connect was successful */
nm_dbus_update_network_info (data->dbus_connection, ap);
/* Cache the correct auth method in our AP list too */
if ((tmp_ap = nm_ap_list_get_ap_by_essid (data->allowed_ap_list, nm_ap_get_essid (ap))))
nm_ap_set_auth_method (tmp_ap, nm_ap_get_auth_method (ap));
}
nm_policy_schedule_activation_finish (req);
nm_device_set_link_active (dev, nm_device_probe_link_state (dev));
}
......@@ -3282,7 +3268,6 @@ void nm_device_set_user_key_for_network (NMActRequest *req, const char *key, con
/* Be sure to update NMI with the new auth mode */
nm_ap_set_auth_method (allowed_ap, NM_DEVICE_AUTH_METHOD_OPEN_SYSTEM);
nm_dbus_update_network_info (data->dbus_connection, allowed_ap);
nm_device_activate_schedule_stage1_device_prepare (req);
}
......
......@@ -63,6 +63,14 @@ static gboolean nm_policy_activation_finish (NMActRequest *req)
{
struct ether_addr addr;
NMAccessPoint * ap = nm_act_request_get_ap (req);
NMAccessPoint *tmp_ap;
/* Cache details in the info-daemon since the connect was successful */
nm_dbus_update_network_info (data->dbus_connection, ap);
/* Cache the correct auth method in our AP list too */
if ((tmp_ap = nm_ap_list_get_ap_by_essid (data->allowed_ap_list, nm_ap_get_essid (ap))))
nm_ap_set_auth_method (tmp_ap, nm_ap_get_auth_method (ap));
nm_device_get_ap_address (dev, &addr);
if (!nm_ap_get_address (ap) || !nm_ethernet_address_is_valid (nm_ap_get_address (ap)))
......
......@@ -263,7 +263,7 @@ nm_netlink_monitor_new (void)
{
GObject *instance;
instance = g_object_new (NM_TYPE_NETLINK_MONITOR, NULL);
instance = g_object_new (NM_TYPE_NETLINK_MONITOR, NULL, NULL);
return NM_NETLINK_MONITOR (instance);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment