File system-config-printer-no-openprinting.patch of Package system-config-printer

Overview Repositories Revisions Requests Users Attributes Meta

File system-config-printer-no-openprinting.patch of Package system-config-printer (Revision 3ba62571502120554940e6872ad0f4b7)

Currently displaying revision 3ba62571502120554940e6872ad0f4b7 , Show latest

Index: system-config-printer-1.3.8/cupshelpers/openprinting.py
===================================================================
--- system-config-printer-1.3.8.orig/cupshelpers/openprinting.py
+++ system-config-printer-1.3.8/cupshelpers/openprinting.py
@@ -48,6 +48,11 @@ class _QueryThread (threading.Thread):
 
     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
+
         # Callback function for pycURL collecting the data coming from
         # the web server
         def collect_data(result):
@@ -82,6 +87,7 @@ class _QueryThread (threading.Thread):
             self.result = sys.exc_info ()
             if status == None: status = 0
 
+        ## openSUSE: just a guard to know if first part in patch should be updated
         if self.callback != None:
             self.callback (status, self.user_data, self.result)
 
Index: system-config-printer-1.3.8/newprinter.py
===================================================================
--- system-config-printer-1.3.8.orig/newprinter.py
+++ system-config-printer-1.3.8/newprinter.py
@@ -362,6 +362,8 @@ class NewPrinterGUI(GtkGUI):
         # Set up OpenPrinting widgets.
         self.openprinting = cupshelpers.openprinting.OpenPrinting ()
         self.openprinting_query_handle = 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)
@@ -1248,6 +1250,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 ()
@@ -3340,6 +3343,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 ()

Places

File system-config-printer-no-openprinting.patch of Package system-config-printer (Revision 3ba62571502120554940e6872ad0f4b7)

Places