From 752fb1e06953f9564651f710570aea802a5ec060 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 2 Jul 2013 12:54:44 +0100
Subject: [PATCH] Fixed another codec issue (bug #978970).

Resolves: rhbz#978970
---
 system-config-printer-utf8-978970.patch | 12 ++++++++++++
 system-config-printer.spec              |  5 +++++
 2 files changed, 17 insertions(+)
 create mode 100644 system-config-printer-utf8-978970.patch

diff --git a/system-config-printer-utf8-978970.patch b/system-config-printer-utf8-978970.patch
new file mode 100644
index 0000000..9be17ff
--- /dev/null
+++ b/system-config-printer-utf8-978970.patch
@@ -0,0 +1,12 @@
+diff -up system-config-printer-1.4.1/system-config-printer.py.utf8-978970 system-config-printer-1.4.1/system-config-printer.py
+--- system-config-printer-1.4.1/system-config-printer.py.utf8-978970	2013-07-02 12:51:32.083930404 +0100
++++ system-config-printer-1.4.1/system-config-printer.py	2013-07-02 12:53:25.668419559 +0100
+@@ -1324,7 +1324,7 @@ class GUI(GtkGUI):
+             self.rename_entry_sigids.append ((editable, id))
+ 
+     def printer_name_editing (self, entry):
+-        newname = origname = unicode (entry.get_text())
++        newname = origname = entry.get_text().decode ('utf-8')
+         newname = newname.replace("/", "")
+         newname = newname.replace("#", "")
+         newname = newname.replace(" ", "")
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 4cb04e5..0253233 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -26,6 +26,7 @@ Patch17: system-config-printer-utf8-971973.patch
 Patch18: system-config-printer-statusicon-geometry.patch
 Patch19: system-config-printer-remote-missing.patch
 Patch20: system-config-printer-rename-race.patch
+Patch21: system-config-printer-utf8-978970.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -132,6 +133,9 @@ printers.
 # Avoid race when renaming printer (bug #975705).
 %patch20 -p1 -b .rename-race
 
+# Fixed another codec issue (bug #978970).
+%patch21 -p1 -b .utf8-978970
+
 %build
 %configure --with-udev-rules
 
@@ -232,6 +236,7 @@ exit 0
 
 %changelog
 * Tue Jul  2 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-8
+- Fixed another codec issue (bug #978970).
 - Avoid race when renaming printer (bug #975705).
 - Don't check for missing drivers in remote printers (bug #975058)
 - Another fix from the move to gi.repository (bug #973662).