|
 |
0a882b |
diff -up system-config-printer-1.4.1/newprinter.py.remote-missing system-config-printer-1.4.1/newprinter.py
|
|
|
0a882b |
--- system-config-printer-1.4.1/newprinter.py.remote-missing 2013-07-02 12:47:40.326084898 +0100
|
|
|
0a882b |
+++ system-config-printer-1.4.1/newprinter.py 2013-07-02 12:48:29.943214126 +0100
|
|
|
0a882b |
@@ -3894,9 +3894,6 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
else:
|
|
|
0a882b |
name = self._name
|
|
|
0a882b |
|
|
|
0a882b |
- # Whether to check for missing drivers.
|
|
|
0a882b |
- check = False
|
|
|
0a882b |
- checkppd = None
|
|
|
0a882b |
ppd = self.ppd
|
|
|
0a882b |
|
|
|
0a882b |
if self.dialog_mode == "class":
|
|
|
0a882b |
@@ -3936,7 +3933,6 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
if isinstance(ppd, str) or isinstance(ppd, unicode):
|
|
|
0a882b |
self.cups.addPrinter(name, ppdname=ppd,
|
|
|
0a882b |
device=uri, info=info, location=location)
|
|
|
0a882b |
- check = True
|
|
|
0a882b |
elif ppd is None: # raw queue
|
|
|
0a882b |
self.cups.addPrinter(name, device=uri,
|
|
|
0a882b |
info=info, location=location)
|
|
|
0a882b |
@@ -3944,8 +3940,6 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
cupshelpers.setPPDPageSize(ppd, self.language[0])
|
|
|
0a882b |
self.cups.addPrinter(name, ppd=ppd, device=uri,
|
|
|
0a882b |
info=info, location=location)
|
|
|
0a882b |
- check = True
|
|
|
0a882b |
- checkppd = ppd
|
|
|
0a882b |
except cups.IPPError, (e, msg):
|
|
|
0a882b |
ready (self.NewPrinterWindow)
|
|
|
0a882b |
self.show_IPP_Error(e, msg)
|
|
|
0a882b |
@@ -4041,10 +4035,6 @@ class NewPrinterGUI(GtkGUI):
|
|
|
0a882b |
|
|
|
0a882b |
self.cups._end_operation ()
|
|
|
0a882b |
|
|
|
0a882b |
- if not raw:
|
|
|
0a882b |
- check = True
|
|
|
0a882b |
- checkppd = ppd
|
|
|
0a882b |
-
|
|
|
0a882b |
self.NewPrinterWindow.hide()
|
|
|
0a882b |
if self.dialog_mode in ["printer", "printer_with_uri", "class"]:
|
|
|
0a882b |
self.emit ('printer-added', name)
|
|
|
0a882b |
diff -up system-config-printer-1.4.1/system-config-printer.py.remote-missing system-config-printer-1.4.1/system-config-printer.py
|
|
|
0a882b |
--- system-config-printer-1.4.1/system-config-printer.py.remote-missing 2013-07-02 12:47:40.328085296 +0100
|
|
|
0a882b |
+++ system-config-printer-1.4.1/system-config-printer.py 2013-07-02 12:48:29.944214283 +0100
|
|
|
0a882b |
@@ -1846,20 +1846,19 @@ class GUI(GtkGUI):
|
|
|
0a882b |
|
|
|
0a882b |
iter = model.iter_next (iter)
|
|
|
0a882b |
|
|
|
0a882b |
- # Finally, suggest printing a test page.
|
|
|
0a882b |
+ # Any missing drivers?
|
|
|
0a882b |
self.propertiesDlg.load (name)
|
|
|
0a882b |
- if self.propertiesDlg.ppd or \
|
|
|
0a882b |
- ((self.propertiesDlg.printer.remote or \
|
|
|
0a882b |
- ((self.propertiesDlg.printer.device_uri.startswith('dnssd:') or \
|
|
|
0a882b |
- self.propertiesDlg.printer.device_uri.startswith('mdns:')) and \
|
|
|
0a882b |
- self.propertiesDlg.printer.device_uri.endswith('/cups'))) and not\
|
|
|
0a882b |
- self.propertiesDlg.printer.discovered):
|
|
|
0a882b |
+ if (self.propertiesDlg.ppd and
|
|
|
0a882b |
+ not (self.propertiesDlg.printer.discovered or
|
|
|
0a882b |
+ self.propertiesDlg.printer.remote)):
|
|
|
0a882b |
try:
|
|
|
0a882b |
self.checkDriverExists (self.PrintersWindow, name,
|
|
|
0a882b |
ppd=self.propertiesDlg.ppd)
|
|
|
0a882b |
except:
|
|
|
0a882b |
nonfatalException()
|
|
|
0a882b |
|
|
|
0a882b |
+ # Finally, suggest printing a test page.
|
|
|
0a882b |
+ if self.propertiesDlg.ppd:
|
|
|
0a882b |
q = Gtk.MessageDialog (self.PrintersWindow,
|
|
|
0a882b |
Gtk.DialogFlags.DESTROY_WITH_PARENT |
|
|
|
0a882b |
Gtk.DialogFlags.MODAL,
|