[wicd/f15] Initialize appGui._wired_showing in __init__ (#723553) Make sure check and message in wicd-cli are a

[David Cantrell]

commit 496bc86752b8fe717703008f2c84e69e3297dd8b
Author: David Cantrell <dcantrell at redhat.com>
Date:   Fri Aug 19 16:10:31 2011 -0400

    Initialize appGui._wired_showing in __init__ (#723553)
    Make sure check and message in wicd-cli are a lambda (#712435)

 wicd-1.7.0-initialize-check-and-message.patch |   13 +++++++++++++
 wicd-1.7.0-wired_showing.patch                |   11 +++++++++++
 wicd.spec                                     |   14 +++++++++++++-
 3 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/wicd-1.7.0-initialize-check-and-message.patch b/wicd-1.7.0-initialize-check-and-message.patch
new file mode 100644
index 0000000..323e549
--- /dev/null
+++ b/wicd-1.7.0-initialize-check-and-message.patch
@@ -0,0 +1,13 @@
+diff -up wicd-1.7.0/cli/wicd-cli.py.orig wicd-1.7.0/cli/wicd-cli.py
+--- wicd-1.7.0/cli/wicd-cli.py.orig	2011-08-19 15:24:57.413159478 -0400
++++ wicd-1.7.0/cli/wicd-cli.py	2011-08-19 15:31:49.790055545 -0400
+@@ -195,6 +195,9 @@ if options.connect:
+ 
+ 		check = lambda: wired.CheckIfWiredConnecting()
+ 		message = lambda: wired.CheckWiredConnectingMessage()
++	else:
++		check = lambda: False
++		message = lambda: False
+ 
+ 	# update user on what the daemon is doing
+ 	last = None
diff --git a/wicd-1.7.0-wired_showing.patch b/wicd-1.7.0-wired_showing.patch
new file mode 100644
index 0000000..275e4f3
--- /dev/null
+++ b/wicd-1.7.0-wired_showing.patch
@@ -0,0 +1,11 @@
+diff -up wicd-1.7.0/gtk/gui.py.orig wicd-1.7.0/gtk/gui.py
+--- wicd-1.7.0/gtk/gui.py.orig	2011-08-19 14:53:37.667180427 -0400
++++ wicd-1.7.0/gtk/gui.py	2011-08-19 14:55:43.657056952 -0400
+@@ -220,6 +220,7 @@ class appGui(object):
+         self.refreshing = False
+         self.prev_state = None
+         self.update_cb = None
++        self._wired_showing = False
+         self.network_list.set_sensitive(False)
+         label = gtk.Label("%s..." % language['scanning'])
+         self.network_list.pack_start(label)
diff --git a/wicd.spec b/wicd.spec
index dd7beb0..10d8e7f 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.0
-Release:             9%{?dist}
+Release:             10%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -25,6 +25,8 @@ Patch1:              wicd-1.7.0-deepcopy.patch
 Patch2:              wicd-1.7.0-dbus-failure.patch
 Patch3:              wicd-1.7.0-error-messages.patch
 Patch4:              wicd-1.7.0-dbus-policy.patch
+Patch5:              wicd-1.7.0-wired_showing.patch
+Patch6:              wicd-1.7.0-initialize-check-and-message.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       python2-devel
@@ -104,6 +106,12 @@ Client program for wicd that uses a GTK+ interface.
 # Allow users at the console to control wicd
 %patch4 -p1
 
+# Initialize appGui._wired_showing in __init__
+%patch5 -p1
+
+# Make sure check and message are always a lambda
+%patch6 -p1
+
 %build
 # NOTE: --etc is where dhclient.conf.template goes
 %{__python} setup.py configure \
@@ -288,6 +296,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Fri Aug 19 2011 David Cantrell <dcantrell at redhat.com> - 1.7.0-10
+- Initialize appGui._wired_showing in __init__ (#723553)
+- Make sure check and message in wicd-cli are a lambda (#712435)
+
 * Thu Aug 11 2011 David Cantrell <dcantrell at redhat.com> - 1.7.0-9
 - Correct systemd unit file for wicd, add D-Bus service file (#699116)
 - Move docs to the wicd-common subpackage