rpms/system-config-printer/devel system-config-printer-asyncipp-traceback.patch, NONE, 1.1 system-config-printer.spec, 1.379, 1.380

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3639

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-asyncipp-traceback.patch 
Log Message:
* Thu Mar 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-8
- Fixed traceback in asyncipp (bug #576932).


system-config-printer-asyncipp-traceback.patch:
 asyncipp.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE system-config-printer-asyncipp-traceback.patch ---
diff -up system-config-printer-1.2.0/asyncipp.py.asyncipp-traceback system-config-printer-1.2.0/asyncipp.py
--- system-config-printer-1.2.0/asyncipp.py.asyncipp-traceback	2010-03-25 16:36:02.264236367 +0000
+++ system-config-printer-1.2.0/asyncipp.py	2010-03-25 16:36:08.558237409 +0000
@@ -189,20 +189,20 @@ class _IPPConnectionThread(threading.Thr
 
     def _reply (self, result):
         def send_reply (result):
-            self._reply_handler (self._conn, result)
+            if self._reply_handler:
+                self._reply_handler (self._conn, result)
             return False
 
-        if self._reply_handler:
-            gobject.idle_add (send_reply, result)
+        gobject.idle_add (send_reply, result)
 
     def _error (self, exc):
         def send_error (exc):
-            self._error_handler (self._conn, exc)
+            if self._error_handler:
+                self._error_handler (self._conn, exc)
             return False
 
-        if self._error_handler:
-            debugprint ("Add %s to idle" % self._error_handler)
-            gobject.idle_add (send_error, exc)
+        debugprint ("Add %s to idle" % self._error_handler)
+        gobject.idle_add (send_error, exc)
 
 ###
 ### This is the user-visible class.  Although it does not inherit from


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- system-config-printer.spec	25 Mar 2010 16:37:15 -0000	1.379
+++ system-config-printer.spec	25 Mar 2010 16:38:08 -0000	1.380
@@ -28,6 +28,7 @@ Patch8: system-config-printer-downloadab
 Patch9: system-config-printer-JobCancel.patch
 Patch10: system-config-printer-inklevel.patch
 Patch11: system-config-printer-cdi-search-harder.patch
+Patch12: system-config-printer-asyncipp-traceback.patch
 
 Patch100: system-config-printer-pycups-build.patch
 
@@ -122,6 +123,9 @@ printers.
 # check-device-ids: search harder for missing Device IDs.
 %patch11 -p1 -b .cdi-search-harder
 
+# Fixed traceback in asyncipp (bug #576932).
+%patch12 -p1 -b .cdi-search-harder
+
 pushd pycups-%{pycups_version}
 
 # Fixed pycups build with new distutils.
@@ -245,6 +249,7 @@ exit 0
 
 %changelog
 * Thu Mar 25 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-8
+- Fixed traceback in asyncipp (bug #576932).
 - check-device-ids: search harder for missing Device IDs.
 - Make inklevel widget easier to read (bug #576930).