From b00b5e01d389f02853c1711ec6408b0c8648cde5 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 7 Jun 2013 16:58:20 +0100
Subject: [PATCH] Use the right signal for spotting when editing is done when
 renaming a printer (bug #971404).

---
 system-config-printer-rename.patch | 75 ++++++++++++++++++++++++++++++
 system-config-printer.spec         |  3 ++
 2 files changed, 78 insertions(+)
 create mode 100644 system-config-printer-rename.patch

diff --git a/system-config-printer-rename.patch b/system-config-printer-rename.patch
new file mode 100644
index 0000000..48bd412
--- /dev/null
+++ b/system-config-printer-rename.patch
@@ -0,0 +1,75 @@
+diff -up system-config-printer-1.4.1/system-config-printer.py.rename system-config-printer-1.4.1/system-config-printer.py
+--- system-config-printer-1.4.1/system-config-printer.py.rename	2013-05-09 12:10:45.000000000 +0100
++++ system-config-printer-1.4.1/system-config-printer.py	2013-06-07 16:57:05.066174697 +0100
+@@ -1296,18 +1296,27 @@ class GUI(GtkGUI):
+         ids = []
+         ids.append (cell.connect ('editing-started',
+                                  self.printer_name_edit_start))
+-        ids.append (cell.connect ('edited', self.printer_name_edited))
+         ids.append (cell.connect ('editing-canceled',
+                                  self.printer_name_edit_cancel))
+         self.rename_sigids = ids
+-        self.rename_entry_sigid = None
++        self.rename_entry_sigids = []
+         self.dests_iconview.set_cursor (path, cell, True)
+ 
+     def printer_name_edit_start (self, cell, editable, path):
+-        debugprint ("editing-started")
++        debugprint ("editing-started with cell=%s, editable=%s" %
++                    (repr (cell),
++                     repr (editable)))
+         if isinstance(editable, Gtk.Entry):
+             id = editable.connect('changed', self.printer_name_editing)
+-            self.rename_entry_sigid = editable, id
++            self.rename_entry_sigids.append ((editable, id))
++
++            model = self.dests_iconview.get_model ()
++            iter = model.get_iter (path)
++            name = model.get_value (iter, 2).decode ('utf-8')
++            id = editable.connect('editing-done',
++                                  self.printer_name_editing_done,
++                                  cell, name)
++            self.rename_entry_sigids.append ((editable, id))
+ 
+     def printer_name_editing (self, entry):
+         newname = origname = unicode (entry.get_text())
+@@ -1318,11 +1327,10 @@ class GUI(GtkGUI):
+             debugprint ("removed disallowed character %s" % origname[-1])
+             entry.set_text(newname)
+ 
+-    def printer_name_edited (self, cell, path, newname):
+-        model = self.dests_iconview.get_model ()
+-        iter = model.get_iter (path)
+-        name = model.get_value (iter, 2).decode ('utf-8')
+-        debugprint ("edited: %s -> %s" % (name, newname))
++    def printer_name_editing_done (self, entry, cell, name):
++        debugprint (repr (cell))
++        newname = entry.get_text ().decode ('utf-8')
++        debugprint ("edited: %s -> %s" % (repr (name), repr (newname)))
+         try:
+             self.rename_printer (name, newname)
+         finally:
+@@ -1330,18 +1338,17 @@ class GUI(GtkGUI):
+             cell.set_property ('editable', False)
+             for id in self.rename_sigids:
+                 cell.disconnect (id)
+-            if self.rename_entry_sigid != None:
+-                self.rename_entry_sigid[0].disconnect(self.rename_entry_sigid[1])
++            for obj, id in self.rename_entry_sigids:
++                obj.disconnect (id)
+ 
+     def printer_name_edit_cancel (self, cell):
+-        debugprint ("editing-canceled")
++        debugprint ("editing-canceled (%s)" % repr (cell))
+         cell.stop_editing (True)
+         cell.set_property ('editable', False)
+         for id in self.rename_sigids:
+             cell.disconnect (id)
+-        if self.rename_entry_sigid != None:
+-            self.rename_entry_sigid[0].disconnect(self.rename_entry_sigid[1])
+-
++        for obj, id in self.rename_entry_sigids:
++            obj.disconnect (id)
+ 
+     def rename_printer (self, old_name, new_name):
+         if old_name.lower() == new_name.lower():
diff --git a/system-config-printer.spec b/system-config-printer.spec
index eb6d190..2b3af4d 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -20,6 +20,7 @@ Patch11: system-config-printer-typo.patch
 Patch12: system-config-printer-notify-urgency.patch
 Patch13: system-config-printer-pointer-grab.patch
 Patch14: system-config-printer-np-traceback.patch
+Patch15: system-config-printer-rename.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -207,6 +208,8 @@ exit 0
 
 %changelog
 * Fri Jun  7 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-6
+- Use the right signal for spotting when editing is done when renaming
+  a printer (bug #971404).
 - More fixes for UTF-8 encoding issues (bug #968142).
 - Fixed new printer dialog traceback (bug #969916).