diff -Nur -x '*.orig' -x '*~' system-config-printer-1.3.11+20120807/asyncconn.py system-config-printer-1.3.11+20120807.new/asyncconn.py --- system-config-printer-1.3.11+20120807/asyncconn.py 2012-08-07 19:05:23.000000000 +0200 +++ system-config-printer-1.3.11+20120807.new/asyncconn.py 2012-09-12 16:02:56.862696088 +0200 @@ -20,12 +20,8 @@ import cups import gobject -import gtk import os -import asyncipp -import asyncpk1 -import authconn import config from debug import * import debug @@ -130,6 +126,7 @@ if use_pk and try_as_root: debugprint ("Using polkit-1 connection class") + import asyncpk1 c = asyncpk1.PK1Connection (reply_handler=subst_reply_handler, error_handler=subst_error_handler, host=host, port=port, @@ -138,6 +135,7 @@ self._conn = c else: debugprint ("Using IPP connection class") + import asyncipp c = asyncipp.IPPAuthConnection (reply_handler=subst_reply_handler, error_handler=subst_error_handler, auth_handler=subst_auth_handler, diff -Nur -x '*.orig' -x '*~' system-config-printer-1.3.11+20120807/asyncpk1.py system-config-printer-1.3.11+20120807.new/asyncpk1.py --- system-config-printer-1.3.11+20120807/asyncpk1.py 2012-08-07 19:05:23.000000000 +0200 +++ system-config-printer-1.3.11+20120807.new/asyncpk1.py 2012-09-12 16:03:02.470696268 +0200 @@ -21,7 +21,10 @@ import cups import dbus import gobject -import gtk +try: + import gtk +except: + pass import os import sys import tempfile @@ -102,9 +105,15 @@ return if str (error) == '': - gtk.gdk.threads_enter () + try: + gtk.gdk.threads_enter () + except: + pass self._client_reply_handler (self._conn, self._unpack_fn (*args)) - gtk.gdk.threads_leave () + try: + gtk.gdk.threads_leave () + except: + pass self._destroy () return @@ -117,9 +126,15 @@ if exc.get_dbus_name () == CUPS_PK_NEED_AUTH: exc = cups.IPPError (cups.IPP_NOT_AUTHORIZED, 'pkcancel') - gtk.gdk.threads_enter () + try: + gtk.gdk.threads_enter () + except: + pass self._client_error_handler (self._conn, exc) - gtk.gdk.threads_leave () + try: + gtk.gdk.threads_leave () + except: + pass self._destroy () return