30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
diff -up system-config-printer-1.1.8/system-config-printer.py.https system-config-printer-1.1.8/system-config-printer.py
|
||
|
|
--- system-config-printer-1.1.8/system-config-printer.py.https 2009-06-24 10:46:14.873192155 +0100
|
||
|
|
+++ system-config-printer-1.1.8/system-config-printer.py 2009-06-24 10:46:25.057317039 +0100
|
||
|
|
@@ -5431,7 +5431,13 @@ class NewPrinterGUI(GtkGUI):
|
||
|
|
(host, port) = urllib.splitnport (host, defport=port)
|
||
|
|
|
||
|
|
try:
|
||
|
|
- c = cups.Connection (host=host, port=port)
|
||
|
|
+ if self.device.type == "https":
|
||
|
|
+ encrypt = cups.HTTP_ENCRYPT_ALWAYS
|
||
|
|
+ else:
|
||
|
|
+ encrypt = cups.HTTP_ENCRYPT_IF_REQUESTED
|
||
|
|
+
|
||
|
|
+ c = cups.Connection (host=host, port=port,
|
||
|
|
+ encryption=encrypt)
|
||
|
|
printers = c.getPrinters ()
|
||
|
|
del c
|
||
|
|
except cups.IPPError, (e, m):
|
||
|
|
@@ -5492,6 +5498,10 @@ class NewPrinterGUI(GtkGUI):
|
||
|
|
self.entNPTIPPHostname.set_text (match.group (2))
|
||
|
|
self.entNPTIPPQueuename.set_text (match.group (3))
|
||
|
|
|
||
|
|
+ if self.device.type == "https" and uri.startswith ("ipp:"):
|
||
|
|
+ # Use https in our device URI for this printer.
|
||
|
|
+ uri = "https:" + uri[4:]
|
||
|
|
+
|
||
|
|
self.lblIPPURI.set_text (uri)
|
||
|
|
self.lblIPPURI.show()
|
||
|
|
self.setNPButtons()
|