15618N/Adiff -urN system-config-printer-1.0.12/cupshelpers/cupshelpers.py ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/cupshelpers/cupshelpers.py
15517N/A--- system-config-printer-1.0.12/cupshelpers/cupshelpers.py 2008-11-30 22:47:27.000000000 +0000
15618N/A+++ ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/cupshelpers/cupshelpers.py 2009-01-07 15:25:36.377795000 +0000
15517N/A@@ -20,7 +20,13 @@
15409N/A
15409N/A import cups, pprint, os, tempfile, re
15409N/A import locale
15409N/A-from . import _debugprint
15409N/A+#from cupshelpers import _debugprint
15409N/A+
15517N/A+#python 2.4 does not define os.SEEK_SET
15517N/A+SEEK_SET = 0
15517N/A+
15409N/A+def _debugprint (x):
15618N/A+ return
15409N/A
15409N/A class Printer:
15409N/A _flags_blacklist = ["options", "local"]
15517N/A@@ -790,7 +796,7 @@
15517N/A (tmpfd, tmpfname) = tempfile.mkstemp ()
15517N/A os.unlink (tmpfname)
15517N/A ppd.writeFd (tmpfd)
15517N/A- os.lseek (tmpfd, 0, os.SEEK_SET)
15517N/A+ os.lseek (tmpfd, 0, SEEK_SET)
15517N/A f = os.fdopen (tmpfd, "r")
15517N/A search = "*cupsFilter:"
15517N/A for line in f.readlines ():
15618N/Adiff -urN system-config-printer-1.0.12/cupshelpers/openprinting.py ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/cupshelpers/openprinting.py
15517N/A--- system-config-printer-1.0.12/cupshelpers/openprinting.py 2008-11-26 17:56:40.000000000 +0000
15618N/A+++ ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/cupshelpers/openprinting.py 2009-01-07 15:25:36.378142000 +0000
15409N/A@@ -21,8 +21,10 @@
15409N/A
15409N/A import urllib, httplib, platform, threading, tempfile, traceback
15409N/A import os, sys
15409N/A-from xml.etree.ElementTree import XML
15409N/A-from . import Device
15409N/A+import xml.dom.minidom
15409N/A+#from xml.etree.ElementTree import XML
15409N/A+#from . import Device
15409N/A+from cupshelpers import Device
15409N/A
15409N/A __all__ = ['OpenPrinting']
15409N/A
15618N/Adiff -urN system-config-printer-1.0.12/cupshelpers/ppds.py ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/cupshelpers/ppds.py
15517N/A--- system-config-printer-1.0.12/cupshelpers/ppds.py 2008-11-26 17:56:40.000000000 +0000
15618N/A+++ ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/cupshelpers/ppds.py 2009-01-07 15:25:36.378769000 +0000
15409N/A@@ -21,12 +21,14 @@
15409N/A ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
15409N/A
15409N/A import cups
15409N/A-from .cupshelpers import parseDeviceID
15409N/A+#from .cupshelpers import parseDeviceID
15409N/A+from cupshelpers import parseDeviceID
15409N/A import string
15409N/A import locale
15409N/A import os.path
15409N/A import re
15409N/A-from . import _debugprint
15409N/A+#from . import _debugprint
15409N/A+from cupshelpers import _debugprint
15409N/A
15409N/A __all__ = ['ppdMakeModelSplit',
15409N/A 'PPDs']
15618N/Adiff -urN system-config-printer-1.0.12/system-config-printer.glade ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/system-config-printer.glade
15618N/A--- system-config-printer-1.0.12/system-config-printer.glade 2008-11-30 22:47:27.000000000 +0000
15618N/A+++ ../SUNWcups-manager-2.25.2.hacked/system-config-printer-1.0.12/system-config-printer.glade 2009-01-07 15:35:57.458262000 +0000
15618N/A@@ -3245,7 +3245,7 @@
15618N/A
15618N/A <child>
15618N/A <widget class="GtkRadioButton" id="rbtnNPDownloadableDriverSearch">
15618N/A- <property name="visible">True</property>
15618N/A+ <property name="visible">False</property>
15618N/A <property name="can_focus">True</property>
15618N/A <property name="label" translatable="yes">Search for a printer driver to download</property>
15618N/A <property name="use_underline">True</property>