rpms/system-config-printer/devel system-config-printer-asyncipp-traceback.patch, 1.2, 1.3 system-config-printer.spec, 1.386, 1.387

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer-asyncipp-traceback.patch 
	system-config-printer.spec 
Log Message:
* Fri Mar 26 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-11
- More async traceback fixes (Ubuntu #547075).


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

Index: system-config-printer-asyncipp-traceback.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer-asyncipp-traceback.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- system-config-printer-asyncipp-traceback.patch	26 Mar 2010 10:28:38 -0000	1.2
+++ system-config-printer-asyncipp-traceback.patch	26 Mar 2010 12:54:31 -0000	1.3
@@ -1,6 +1,6 @@
 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	2010-03-26 10:26:03.187725661 +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 12:50:51.888627367 +0000
 @@ -59,6 +59,7 @@ class _IPPConnectionThread(threading.Thr
          self._auth_handler = auth_handler
          self._auth_queue = Queue.Queue (1)
@@ -17,28 +17,35 @@ diff -up system-config-printer-1.2.0/asy
          del self._conn # already destroyed
          del self._reply_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 send_reply (result):
+-        def send_reply (result):
 -            self._reply_handler (self._conn, result)
-+            if not self._destroyed and self._reply_handler:
-+                self._reply_handler (self._conn, result)
++        def send_reply (handler, result):
++            if not self._destroyed:
++                handler (self._conn, result)
              return False
  
 -        if self._reply_handler:
+-            gobject.idle_add (send_reply, result)
 +        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 send_error (exc):
+-        def send_error (exc):
 -            self._error_handler (self._conn, exc)
-+            if not self._destroyed and self._error_handler:
-+                self._error_handler (self._conn, exc)
++        def send_error (handler, exc):
++            if not self._destroyed:
++                handler (self._conn, exc)
              return False
  
 -        if self._error_handler:
 +        if not self._destroyed and 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


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.386
retrieving revision 1.387
diff -u -p -r1.386 -r1.387
--- system-config-printer.spec	26 Mar 2010 10:36:30 -0000	1.386
+++ system-config-printer.spec	26 Mar 2010 12:54:32 -0000	1.387
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -258,6 +258,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Mar 26 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-11
+- More async traceback fixes (Ubuntu #547075).
+
 * Fri Mar 26 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-10
 - Better inklevel 25/50/75 markers.
 - Fixed window transience for 'Change Device URI'.