From 809915938face97618904d4151ccae0c4d0692ce Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 17 Mar 2005 21:43:21 +0000 Subject: [PATCH] 2005-03-17 Dan Williams Patch from Tom Parker: * src/nm-netlink-monitor.c - Include unistd.h * info-daemon/NetworkManagerInfoDbus.c - (nmi_dbus_update_network_auth_method): free GConf values Patch from Nathaniel McCallum : * src/NetworkManagerDevice.c - (nm_device_set_wireless_config): wait for successful association longer for some cards (Atheros a/b/g) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@502 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 13 +++++++++++++ info-daemon/NetworkManagerInfoDbus.c | 2 ++ src/NetworkManagerDevice.c | 2 +- src/nm-netlink-monitor.c | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 05942d10e7..9daa6d9fad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-03-17 Dan Williams + + Patch from Tom Parker: + * src/nm-netlink-monitor.c + - Include unistd.h + * info-daemon/NetworkManagerInfoDbus.c + - (nmi_dbus_update_network_auth_method): free GConf values + + Patch from Nathaniel McCallum : + * src/NetworkManagerDevice.c + - (nm_device_set_wireless_config): wait for successful + association longer for some cards (Atheros a/b/g) + 2005-03-15 Ray Strode * src/NetworkManager.c: diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c index 6cc4808379..1958b305e5 100644 --- a/info-daemon/NetworkManagerInfoDbus.c +++ b/info-daemon/NetworkManagerInfoDbus.c @@ -540,6 +540,8 @@ static DBusMessage *nmi_dbus_update_network_auth_method (NMIAppInfo *info, DBusM gconf_client_set_int (info->gconf_client, key, auth_method, NULL); g_free (key); } + if (value) + gconf_value_free (value); g_free (escaped_network); diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index a3afb6ed4d..1eddedd1e6 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -1883,7 +1883,7 @@ static gboolean nm_device_set_wireless_config (NMDevice *dev, NMAccessPoint *ap) ((auth == NM_DEVICE_AUTH_METHOD_SHARED_KEY) ? "Shared Key" : "unknown"))); /* Bring the device up and pause to allow card to associate. */ - g_usleep (G_USEC_PER_SEC * 2); + g_usleep (G_USEC_PER_SEC * nm_device_get_association_pause_value (dev)); /* Some cards don't really work well in ad-hoc mode unless you explicitly set the bitrate * on them. (Netgear WG511T/Atheros 5212 with madwifi drivers). Until we can get rate information diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index c19d30f74d..25c7cc8b29 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include