rpms/NetworkManager/devel NetworkManager-0.6.5-no-killswitch-fix.patch, NONE, 1.1 NetworkManager.spec, 1.151, 1.152

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7193

Modified Files:
	NetworkManager.spec 
Added Files:
	NetworkManager-0.6.5-no-killswitch-fix.patch 
Log Message:
* Wed Jun 27 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-7
- Fix Wireless Enabled checkbox when no killswitches are present



NetworkManager-0.6.5-no-killswitch-fix.patch:

--- NEW FILE NetworkManager-0.6.5-no-killswitch-fix.patch ---
Index: NetworkManager-0.6.5/src/NetworkManager.c
===================================================================
--- NetworkManager-0.6.5/src/NetworkManager.c	(revision 2617)
+++ NetworkManager-0.6.5/src/NetworkManager.c	(working copy)
@@ -825,6 +825,10 @@
 		nm_add_initial_killswitch_devices (data);
 		nm_add_initial_devices (data);
 	}
+
+	/* If there weren't any killswitches, mark hardware RF to on */
+	if (g_slist_length (data->killswitch_list) == 0)
+		data->hw_rf_enabled = TRUE;
 }
 
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- NetworkManager.spec	21 Jun 2007 15:11:09 -0000	1.151
+++ NetworkManager.spec	27 Jun 2007 14:09:46 -0000	1.152
@@ -11,7 +11,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 6.1%{?dist}
+Release: 7%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -20,6 +20,7 @@
 Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: linkdebug.patch
+Patch3: NetworkManager-0.6.5-no-killswitch-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -119,6 +120,7 @@
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
 %patch2 -p1 -b .linkdebug
+%patch3 -p1 -b .no-killswitch-fix
 
 # unpack the applet
 tar -xjf %{SOURCE1}
@@ -247,6 +249,9 @@
 
 
 %changelog
+* Wed Jun 27 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-7
+- Fix Wireless Enabled checkbox when no killswitches are present
+
 * Thu Jun 21 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-6
 - Update to stable branch snapshot:
     - More fixes for ethernet link detection (gnome #354565, rh #194124)