[wicd/f15] Fix 'guiutil.py:147:set_text:TypeError: Gtk.Entry.set_text()

[David Cantrell]

commit ec74c6331fddf611785dd67d0ac6c9b973e6480a
Author: David Cantrell <dcantrell at redhat.com>
Date:   Wed Apr 25 11:43:36 2012 -0400

    Fix 'guiutil.py:147:set_text:TypeError: Gtk.Entry.set_text()
    
      argument 1 must be string, not dbus.Boolean' (#740256)

 wicd-1.7.0-bz740256.patch |   34 ++++++++++++++++++++++++++++++++++
 wicd.spec                 |   10 +++++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/wicd-1.7.0-bz740256.patch b/wicd-1.7.0-bz740256.patch
new file mode 100644
index 0000000..18b625a
--- /dev/null
+++ b/wicd-1.7.0-bz740256.patch
@@ -0,0 +1,34 @@
+diff -up wicd-1.7.0/gtk/guiutil.py.orig wicd-1.7.0/gtk/guiutil.py
+--- wicd-1.7.0/gtk/guiutil.py.orig	2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/gtk/guiutil.py	2012-04-25 11:40:30.747191654 -0400
+@@ -106,13 +106,12 @@ def string_input(prompt, secondary, text
+     dialog.vbox.pack_end(hbox, True, True, 0)
+     dialog.show_all()
+ 
++    text = ''
+     if dialog.run() == gtk.RESPONSE_OK:
+-        text = entry.get_text()
+-        dialog.destroy()
+-        return text
+-    else:
+-        dialog.destroy()
+-        return None
++        text = entry.get_text().strip()
++
++    dialog.destroy()
++    return text
+ 
+ class SmallLabel(gtk.Label):
+     def __init__(self, text=''):
+diff -up wicd-1.7.0/gtk/netentry.py.orig wicd-1.7.0/gtk/netentry.py
+--- wicd-1.7.0/gtk/netentry.py.orig	2010-01-14 23:49:11.000000000 -0500
++++ wicd-1.7.0/gtk/netentry.py	2012-04-25 11:41:06.364192922 -0400
+@@ -725,7 +725,7 @@ class WiredNetworkEntry(NetworkEntry):
+                                   "will not be used by the computer. It " +
+                                   "allows you to " + 
+                                   "easily distinguish between different network " +
+-                                  "profiles.", "Profile name:").strip()
++                                  "profiles.", "Profile name:")
+ 
+         # if response is "" or None
+         if not response:
diff --git a/wicd.spec b/wicd.spec
index 31f1df3..c099d70 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.0
-Release:             12%{?dist}
+Release:             13%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -29,6 +29,7 @@ Patch5:              wicd-1.7.0-wired_showing.patch
 Patch6:              wicd-1.7.0-initialize-check-and-message.patch
 Patch7:              wicd-1.7.0-CVE-2012-0813.patch
 Patch8:              wicd-1.7.0-CVE-2012-2095.patch
+Patch9:              wicd-1.7.0-bz740256.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       python2-devel
@@ -124,6 +125,9 @@ Client program for wicd that uses a GTK+ interface.
 # http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/revision/751
 %patch8 -p1
 
+# Fix BZ #740256
+%patch9 -p1
+
 %build
 # NOTE: --etc is where dhclient.conf.template goes
 %{__python} setup.py configure \
@@ -308,6 +312,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Wed Apr 25 2012 David Cantrell <dcantrell at redhat.com> - 1.7.0-13
+- Fix 'guiutil.py:147:set_text:TypeError: Gtk.Entry.set_text()
+  argument 1 must be string, not dbus.Boolean' (#740256)
+
 * Fri Apr 13 2012 David Cantrell <dcantrell at redhat.com> - 1.7.0-12
 - Fix CVE-2012-2095 (#811763)