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

- More async traceback fixes (Ubuntu #547075).

Browse Source
This commit is contained in:
Tim Waugh 2010-03-26 12:53:25 +00:00
parent 83894836a8
commit 1fcc63811b
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
system-config-printer-asyncipp-traceback.patch
View File

@ -1,6 +1,6 @@
diff -up system-config-printer-1.2.0/asyncipp.py.asyncipp-traceback system-config-printer-1.2.0/asyncipp.py 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-26 10:26:00.420734896 +0000 --- system-config-printer-1.2.0/asyncipp.py.asyncipp-traceback 2010-03-26 12:50:39.829627667 +0000
+++ system-config-printer-1.2.0/asyncipp.py 2010-03-26 10:26:03.187725661 +0000 +++ system-config-printer-1.2.0/asyncipp.py 2010-03-26 12:50:51.888627367 +0000
@@ -59,6 +59,7 @@ class _IPPConnectionThread(threading.Thr @@ -59,6 +59,7 @@ class _IPPConnectionThread(threading.Thr
self._auth_handler = auth_handler self._auth_handler = auth_handler
self._auth_queue = Queue.Queue (1) self._auth_queue = Queue.Queue (1)
@ -17,28 +17,35 @@ diff -up system-config-printer-1.2.0/asyncipp.py.asyncipp-traceback system-confi
del self._conn # already destroyed del self._conn # already destroyed
del self._reply_handler del self._reply_handler
del self._error_handler del self._error_handler
@@ -189,18 +191,20 @@ class _IPPConnectionThread(threading.Thr @@ -188,21 +190,23 @@ class _IPPConnectionThread(threading.Thr
return password
def _reply (self, result): def _reply (self, result):
def send_reply (result): - def send_reply (result):
- self._reply_handler (self._conn, result) - self._reply_handler (self._conn, result)
+ if not self._destroyed and self._reply_handler: + def send_reply (handler, result):
+ self._reply_handler (self._conn, result) + if not self._destroyed:
+ handler (self._conn, result)
return False return False
- if self._reply_handler: - if self._reply_handler:
- gobject.idle_add (send_reply, result)
+ if not self._destroyed and self._reply_handler: + if not self._destroyed and self._reply_handler:
gobject.idle_add (send_reply, result) + gobject.idle_add (send_reply, self._reply_handler, result)
def _error (self, exc): def _error (self, exc):
def send_error (exc): - def send_error (exc):
- self._error_handler (self._conn, exc) - self._error_handler (self._conn, exc)
+ if not self._destroyed and self._error_handler: + def send_error (handler, exc):
+ self._error_handler (self._conn, exc) + if not self._destroyed:
+ handler (self._conn, exc)
return False return False
- if self._error_handler: - if self._error_handler:
+ if not self._destroyed and self._error_handler: + if not self._destroyed and self._error_handler:
debugprint ("Add %s to idle" % self._error_handler) debugprint ("Add %s to idle" % self._error_handler)
gobject.idle_add (send_error, exc) - gobject.idle_add (send_error, exc)
+ gobject.idle_add (send_error, self._error_handler, exc)
###
### This is the user-visible class. Although it does not inherit from

5
system-config-printer.spec
View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.0 Version: 1.2.0
Release: 10%{?dist} Release: 11%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -258,6 +258,9 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Fri Mar 26 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-11
- More async traceback fixes (Ubuntu #547075).
* Fri Mar 26 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-10 * Fri Mar 26 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-10
- Better inklevel 25/50/75 markers. - Better inklevel 25/50/75 markers.
- Fixed window transience for 'Change Device URI'. - Fixed window transience for 'Change Device URI'.