[wicd] Fix some Unicode string handling and display problems (#845749)

[David Cantrell]

commit 9d2447bd84ba664d2c32a4278adc60aeef69acd4
Author: David Cantrell <dcantrell at redhat.com>
Date:   Tue Oct 23 14:08:21 2012 -0400

    Fix some Unicode string handling and display problems (#845749)

 wicd-1.7.2.4-unicode.patch |   21 +++++++++++++++++++++
 wicd.spec                  |    9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/wicd-1.7.2.4-unicode.patch b/wicd-1.7.2.4-unicode.patch
new file mode 100644
index 0000000..40ab99a
--- /dev/null
+++ b/wicd-1.7.2.4-unicode.patch
@@ -0,0 +1,21 @@
+diff -up wicd-1.7.2.4/curses/netentry_curses.py.unicode wicd-1.7.2.4/curses/netentry_curses.py
+--- wicd-1.7.2.4/curses/netentry_curses.py.unicode	2012-02-11 15:35:45.000000000 -0500
++++ wicd-1.7.2.4/curses/netentry_curses.py	2012-10-23 14:06:36.537948070 -0400
+@@ -264,7 +264,7 @@ class WiredSettingsDialog(AdvancedSettin
+         self.set_values()
+         
+         self.prof_name = name
+-        title = _('Configuring preferences for wired profile "$A"').replace('$A',self.prof_name)
++        title = ''.join([_('Configuring preferences for wired profile'), self.prog_name])
+         self._w.header = urwid.Text( ('header',title),align='right' )
+ 
+         self.set_values()
+@@ -386,7 +386,7 @@ class WirelessSettingsDialog(AdvancedSet
+         self.encrypt_types = misc.LoadEncryptionMethods()
+         self.set_values()
+ 
+-        title = _('Configuring preferences for wireless network "$A" ($B)').replace('$A',wireless.GetWirelessProperty(networkID,'essid')).replace('$B',wireless.GetWirelessProperty(networkID,'bssid'))
++        title = ''.join([_('Configuring preferences for wireless network'), wireless.GetWirelessProperty(networkID,'essid'), "(%s)" % wireless.GetWirelessProperty(networkID,'bssid')])
+         self._w.header = urwid.Text(('header',title),align='right' )
+ 
+     def set_values(self):
diff --git a/wicd.spec b/wicd.spec
index b54fcca..1dd188f 100644
--- a/wicd.spec
+++ b/wicd.spec
@@ -9,7 +9,7 @@
 
 Name:                wicd
 Version:             1.7.2.4
-Release:             3%{?dist}
+Release:             4%{?dist}
 Summary:             Wireless and wired network connection manager
 
 Group:               System Environment/Base
@@ -22,6 +22,7 @@ Patch0:              wicd-1.7.0-remove-WHEREAREMYFILES.patch
 Patch1:              wicd-1.7.1-dbus-failure.patch
 Patch2:              wicd-1.7.0-dbus-policy.patch
 Patch3:              wicd-1.7.1-DaemonClosing.patch
+Patch4:              wicd-1.7.2.4-unicode.patch
 
 BuildRoot:           %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:       babel
@@ -102,6 +103,9 @@ Client program for wicd that uses a GTK+ interface.
 # Work around bug in DaemonClosing() calls
 %patch3 -p1
 
+# Unicode string handling problems
+%patch4 -p1
+
 %build
 rm -f po/ast.po
 %{__python} setup.py configure \
@@ -271,6 +275,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/apps/wicd-gtk.svg
 
 %changelog
+* Tue Oct 23 2012 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-4
+- Fix some Unicode string handling and display problems (#845749)
+
 * Tue Oct 23 2012 David Cantrell <dcantrell at redhat.com> - 1.7.2.4-3
 - Use new systemd macros in trigger scripts (#850367)