This commit was manufactured by cvs2svn to create tagSTABLE_0_3_5_PRE_COMPLETION

'STABLE_0_3_5_PRE_COMPLETION'.

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/tags/STABLE_0_3_5_PRE_COMPLETION@517 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

9 files changed, 80 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e5c821d2a..3df6703f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2005-03-28  Dan Williams <dcbw@redhat.com>
+
+	Patch from Bill Moss:
+	* src/NetworkManagerPolicy.c
+		- (nm_policy_allowed_ap_list_update): merge properties
+			for all wireless devices on update, not just active device
+
+2005-03-28  Dan Williams <dcbw@redhat.com>
+
+	* panel-applet/NMWirelessApplet.c
+		- Add some more contributors to the About dialog
+
+2005-03-28  Dan Williams <dcbw@redhat.com>
+
+	* src/NetworkManagerDevice.c
+		- (mdio_read): Fix two bugs that caused all devices to fail
+			the MII carrier detection support checks
+
+2005-03-22  Dan Williams <dcbw@redhat.com>
+
+	Patch from Bill Moss:
+	* src/NetworkManagerInfoDbus.c
+		- (nmi_dbus_update_network_auth_method, nmi_dbus_get_network_properties):
+			free leaked GConf values
+
+2005-03-12  Dan Williams <dcbw@redhat.com>
+
+	Patch from Nathaniel McCallum:
+	* src/NetworkManagerDevice.c
+		- (nm_device_set_wireless_config): Increase timeout for some devices
+
+2005-03-04  Dan Williams <dcbw@redhat.com>
+
+	Patch from Peter Jones:
+	- Make stuff work with gcc 4.0
+
+2005-02-28  Dan Williams <dcbw@redhat.com>
+
+	Tag STABLE_0_3_4_RELEASE
+
+	* configure.in:
+		- Bump version to 0.3.4
+
 2005-02-27  Jim Huang  <jserv@kaffe.org>
 
 	* configure.in: Added "zh_TW" (Traditional Chinese) to ALL_LINGUAS.
diff --git a/configure.in b/configure.in
index f64b7c44f5..3b9a3d16f9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(NetworkManager, 0.3.3, dcbw@redhat.com, NetworkManager)
+AC_INIT(NetworkManager, 0.3.4, dcbw@redhat.com, NetworkManager)
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
@@ -243,7 +243,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	AC_MSG_RESULT(yes)
 	CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
 
-	for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement; do
+	for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement -Wno-pointer-sign ; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
 		AC_MSG_CHECKING([whether gcc understands $option])
diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c
index 1cd5123754..6d4f88d395 100644
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@@ -486,7 +486,8 @@ static DBusMessage *nmi_dbus_get_network_properties (NMIAppInfo *info, DBusMessa
 									DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, array, num_items,
 									DBUS_TYPE_INVALID);
 	}	
-	gconf_value_free (ap_addrs_value);
+	if (ap_addrs_value)
+		gconf_value_free (ap_addrs_value);
 
 	g_free (essid);
 	g_free (key);
@@ -538,6 +539,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/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c
index 90e6804d85..c3083037f1 100644
--- a/panel-applet/NMWirelessApplet.c
+++ b/panel-applet/NMWirelessApplet.c
@@ -121,10 +121,16 @@ void nmwa_about_cb (NMWirelessApplet *applet)
 	static const gchar *authors[] =
 	{
 		"The Red Hat Desktop Team, including:\n",
-		"Dan Williams <dcbw@redhat.com>",
 		"Jonathan Blandford <jrb@redhat.com>",
 		"John Palmieri <johnp@redhat.com>",
+		"Ray Strode <rstrode@redhat.com>",
 		"Colin Walters <walters@redhat.com>",
+		"Dan Williams <dcbw@redhat.com>",
+		"\nAnd others, including:\n",
+		"Bill Moss",
+		"Tom Parker",
+		"j@bootlab.org",
+		"Peter Jones <pjones@redhat.com>",
 		NULL
 	};
 
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 558c19eb6d..b89dbe6df5 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -591,8 +591,10 @@ static void nm_data_free (NMData *data)
 
 static void sigterm_handler (int signum)
 {
+        int ignore;
+
 	syslog (LOG_NOTICE, "Caught SIGINT/SIGTERM");
-	write (nm_data->sigterm_pipe[1], "X", 1);
+	ignore = write (nm_data->sigterm_pipe[1], "X", 1);
 }
 
 static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition condition, gpointer user_data)
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index 0bb80b5fee..f679c68f72 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -279,7 +279,7 @@ void nm_ap_set_encrypted (NMAccessPoint *ap, gboolean encrypted)
  * Return the encryption method the user specified for this access point.
  *
  */
-const NMEncKeyType nm_ap_get_enc_type (const NMAccessPoint *ap)
+NMEncKeyType nm_ap_get_enc_type (const NMAccessPoint *ap)
 {
 	g_return_val_if_fail (ap != NULL, TRUE);
 
diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h
index 2d32aee436..d190deb611 100644
--- a/src/NetworkManagerAP.h
+++ b/src/NetworkManagerAP.h
@@ -43,7 +43,7 @@ void				nm_ap_set_essid		(NMAccessPoint *ap, const char *essid);
 char *			nm_ap_get_enc_key_source	(const NMAccessPoint *ap);
 char *			nm_ap_get_enc_key_hashed	(const NMAccessPoint *ap);
 void				nm_ap_set_enc_key_source	(NMAccessPoint *ap, const char *key, NMEncKeyType type);
-const NMEncKeyType	nm_ap_get_enc_type		(const NMAccessPoint *ap);
+NMEncKeyType	nm_ap_get_enc_type		(const NMAccessPoint *ap);
 
 NMDeviceAuthMethod	nm_ap_get_auth_method	(const NMAccessPoint *ap);
 void				nm_ap_set_auth_method	(NMAccessPoint *ap, const NMDeviceAuthMethod auth_method);
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index b3d6f2576d..94e9fa7bd4 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -1878,7 +1878,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
@@ -3650,13 +3650,13 @@ static int mdio_read (int sk, struct ifreq *ifr, int location)
 {
 	struct mii_ioctl_data *mii;
 
-	g_return_val_if_fail (sk < 0, -1);
+	g_return_val_if_fail (sk >= 0, -1);
 	g_return_val_if_fail (ifr != NULL, -1);
 
 	mii = (struct mii_ioctl_data *) &(ifr->ifr_data);
 	mii->reg_num = location;
 
-	if (ioctl (sk, SIOCGMIIREG, &ifr) < 0)
+	if (ioctl (sk, SIOCGMIIREG, ifr) < 0)
 		return -1;
 
 	return (mii->val_out);
diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c
index 71910fdf68..ea013e272c 100644
--- a/src/NetworkManagerPolicy.c
+++ b/src/NetworkManagerPolicy.c
@@ -468,7 +468,8 @@ void nm_policy_schedule_device_switch (NMDevice *switch_to_dev, NMData *app_data
  */
 static gboolean nm_policy_allowed_ap_list_update (gpointer user_data)
 {
-	NMData		*data = (NMData *)user_data;
+	NMData	*data = (NMData *)user_data;
+	GSList	*elt;
 
 	g_return_val_if_fail (data != NULL, FALSE);
 
@@ -481,6 +482,20 @@ static gboolean nm_policy_allowed_ap_list_update (gpointer user_data)
 	if (data->allowed_ap_list)
 		nm_ap_list_populate_from_nmi (data->allowed_ap_list, data);
 
+	for (elt = data->dev_list; elt != NULL; elt = g_slist_next (elt))
+	{
+		NMDevice	*dev = (NMDevice *)(elt->data);
+		if (nm_device_is_wireless (dev))
+		{
+			/* Once we have the list, copy in any relevant information from our Allowed list and fill
+			 * in the ESSID of base stations that aren't broadcasting their ESSID, if we have their
+			 * MAC address in our allowed list.
+			 */
+			nm_ap_list_copy_essids_by_address (nm_device_ap_list_get (dev), data->allowed_ap_list);
+			nm_ap_list_copy_properties (nm_device_ap_list_get (dev), data->allowed_ap_list);
+		}
+	}	
+
 	/* If the active device doesn't have a best_ap already, make it update to
 	 * get the new data.
 	 */
@@ -490,13 +505,6 @@ static gboolean nm_policy_allowed_ap_list_update (gpointer user_data)
 	{
 		NMAccessPoint	*best_ap;
 
-		/* Once we have the list, copy in any relevant information from our Allowed list and fill
-		 * in the ESSID of base stations that aren't broadcasting their ESSID, if we have their
-		 * MAC address in our allowed list.
-		 */
-		nm_ap_list_copy_essids_by_address (nm_device_ap_list_get (data->active_device), data->allowed_ap_list);
-		nm_ap_list_copy_properties (nm_device_ap_list_get (data->active_device), data->allowed_ap_list);
-
 		best_ap = nm_device_get_best_ap (data->active_device);
 		if (!best_ap)
 			nm_device_update_best_ap (data->active_device);