From aed75cd58fef43b7c6e26e3d2ad58127c6255000 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 27 Jun 2007 14:09:46 +0000 Subject: [PATCH] - Fix Wireless Enabled checkbox when no killswitches are present --- NetworkManager-0.6.5-no-killswitch-fix.patch | 15 +++++++++++++++ NetworkManager.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 NetworkManager-0.6.5-no-killswitch-fix.patch diff --git a/NetworkManager-0.6.5-no-killswitch-fix.patch b/NetworkManager-0.6.5-no-killswitch-fix.patch new file mode 100644 index 0000000..e12cd4e --- /dev/null +++ b/NetworkManager-0.6.5-no-killswitch-fix.patch @@ -0,0 +1,15 @@ +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; + } + + diff --git a/NetworkManager.spec b/NetworkManager.spec index 261c1a8..22b8ab8 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -11,7 +11,7 @@ Name: NetworkManager 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 @@ Source1: nm-applet-%{version}.tar.bz2 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 @@ NetworkManager functionality from applications that use glib. %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 @@ fi %changelog +* Wed Jun 27 2007 Dan Williams 1:0.6.5-7 +- Fix Wireless Enabled checkbox when no killswitches are present + * Thu Jun 21 2007 Dan Williams 1:0.6.5-6 - Update to stable branch snapshot: - More fixes for ethernet link detection (gnome #354565, rh #194124)