Dominique Leuenberger
ce814d57c5
Update to 1.5.16 OBS-URL: https://build.opensuse.org/request/show/980064 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/system-config-printer?expand=0&rev=206
54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
Index: system-config-printer-1.5.16/cupshelpers/openprinting.py
|
|
===================================================================
|
|
--- system-config-printer-1.5.16.orig/cupshelpers/openprinting.py
|
|
+++ system-config-printer-1.5.16/cupshelpers/openprinting.py
|
|
@@ -54,6 +54,10 @@ class _QueryThread (threading.Thread):
|
|
_debugprint ("-%s" % self)
|
|
|
|
def run (self):
|
|
+ ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542
|
|
+ if self.callback != None:
|
|
+ self.callback (403, self.user_data, None)
|
|
+ return
|
|
|
|
# CGI script to be executed
|
|
query_command = "/query.cgi"
|
|
@@ -77,6 +81,7 @@ class _QueryThread (threading.Thread):
|
|
self.result = sys.exc_info()
|
|
|
|
_debugprint ("%s: query complete" % self)
|
|
+ ## openSUSE: just a guard to know if first part in patch should be updated
|
|
if self.callback is not None:
|
|
self.callback (status, self.user_data, self.result)
|
|
|
|
Index: system-config-printer-1.5.16/newprinter.py
|
|
===================================================================
|
|
--- system-config-printer-1.5.16.orig/newprinter.py
|
|
+++ system-config-printer-1.5.16/newprinter.py
|
|
@@ -409,6 +409,8 @@ class NewPrinterGUI(GtkGUI):
|
|
# Set up OpenPrinting widgets.
|
|
self.opreq = None
|
|
self.opreq_handlers = None
|
|
+ ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542
|
|
+ self.rbtnNPDownloadableDriverSearch.hide()
|
|
combobox = self.cmbNPDownloadableDriverFoundPrinters
|
|
cell = Gtk.CellRendererText()
|
|
combobox.pack_start (cell, True)
|
|
@@ -1850,6 +1852,7 @@ class NewPrinterGUI(GtkGUI):
|
|
self.btnNPBack.hide()
|
|
self.btnNPForward.show()
|
|
downloadable_selected = False
|
|
+ ## openSUSE: just a guard to know when the name of the widget to hide changes
|
|
if self.rbtnNPDownloadableDriverSearch.get_active ():
|
|
combobox = self.cmbNPDownloadableDriverFoundPrinters
|
|
iter = combobox.get_active_iter ()
|
|
@@ -4158,6 +4161,8 @@ class NewPrinterGUI(GtkGUI):
|
|
elif self.rbtnNPPPD.get_active():
|
|
ppd = cups.PPD(self.filechooserPPD.get_filename())
|
|
else:
|
|
+ ## Disabled on openSUSE, see discussion in https://bugzilla.novell.com/show_bug.cgi?id=733542
|
|
+ return
|
|
# PPD of the driver downloaded from OpenPrinting XXX
|
|
treeview = self.tvNPDownloadableDrivers
|
|
model, iter = treeview.get_selection ().get_selected ()
|