diff --git a/system-config-printer-async-fallback-2.patch b/system-config-printer-async-fallback-2.patch new file mode 100644 index 0000000..658b807 --- /dev/null +++ b/system-config-printer-async-fallback-2.patch @@ -0,0 +1,26 @@ +diff -up system-config-printer-1.1.90/asyncpk1.py.async-fallback-2 system-config-printer-1.1.90/asyncpk1.py +--- system-config-printer-1.1.90/asyncpk1.py.async-fallback-2 2010-01-18 17:38:54.000000000 +0000 ++++ system-config-printer-1.1.90/asyncpk1.py 2010-01-25 16:00:32.950084610 +0000 +@@ -299,15 +299,15 @@ class PK1Connection: + def _call_with_pk (self, use_pycups, pk_method_name, pk_args, + reply_handler, error_handler, unpack_fn, + fallback_fn, args, kwds): ++ asyncmethodcall = _PK1AsyncMethodCall (self._system_bus, self, ++ pk_method_name, pk_args, ++ reply_handler, ++ error_handler, ++ unpack_fn, fallback_fn, ++ args, kwds) ++ + if not use_pycups: + try: +- asyncmethodcall = _PK1AsyncMethodCall (self._system_bus, self, +- pk_method_name, pk_args, +- reply_handler, +- error_handler, +- unpack_fn, fallback_fn, +- args, kwds) +- + debugprint ("Calling PK method %s" % pk_method_name) + asyncmethodcall.call () + except dbus.DBusException, e: diff --git a/system-config-printer.spec b/system-config-printer.spec index 8603cd3..56f1e91 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -19,6 +19,7 @@ Patch1: system-config-printer-no-epydoc.patch Patch2: system-config-printer-copy-printer.patch Patch3: system-config-printer-spinbuttons.patch Patch4: system-config-printer-raw-statereason.patch +Patch5: system-config-printer-async-fallback-2.patch BuildRequires: cups-devel >= 1.2 BuildRequires: python-devel >= 2.4 @@ -82,6 +83,7 @@ printers. %patch2 -p1 -b .copy-printer %patch3 -p1 -b .spinbuttons %patch4 -p1 -b .raw-statereason +%patch5 -p1 -b .async-fallback-2 %build %configure --with-udev-rules --with-polkit-1 @@ -199,6 +201,7 @@ exit 0 %changelog * Mon Jan 25 2010 Tim Waugh - 1.1.90-3 - Fixed statereason localization for raw queues (bug #558156). +- Fixed async fallback again (bug #557854). * Thu Jan 21 2010 Tim Waugh - 1.1.90-2 - Added GtkAdjustments for all XML-declared SpinButtons.