rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed traceback in asyncipp (bug #576932).

Browse Source
This commit is contained in:
Tim Waugh 2010-03-25 16:38:08 +00:00
parent 427a222de7
commit 57d971d7db
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
system-config-printer-asyncipp-traceback.patch Normal file
View File

@ -0,0 +1,31 @@
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

5
system-config-printer.spec
View File

@ -28,6 +28,7 @@ Patch8: system-config-printer-downloadable-drivers.patch
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@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).