10139N/Adiff -urN system-config-printer-1.0.12/system-config-printer.py ../SUNWcups-manager-2.24.2.hacked/system-config-printer-1.0.12/system-config-printer.py

10139N/A--- system-config-printer-1.0.12/system-config-printer.py 2008-12-12 15:24:32.495607000 +0000

10139N/A+++ ../SUNWcups-manager-2.24.2.hacked/system-config-printer-1.0.12/system-config-printer.py 2008-12-12 15:26:09.842560000 +0000

12189N/A@@ -100,10 +100,6 @@

10139N/A ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR)

10139N/A ellipsis = unichr(0x2026)

10139N/A

17185N/A-TEXT_start_firewall_tool = _("To do this, select "

10139N/A- "System->Administration->Firewall "

17176N/A- "from the main menu.")

17176N/A-

17176N/A try:

10139N/A try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY

15312N/A except AttributeError:

10139N/A@@ -2495,25 +2491,6 @@

18232N/A self.changed = set()

10139N/A self.setDataButtonState()

10139N/A

10139N/A- old_setting = self.server_settings.get (cups.CUPS_SERVER_SHARE_PRINTERS,

10139N/A- '0')

17903N/A- new_setting = setting_dict.get (cups.CUPS_SERVER_SHARE_PRINTERS, '0')

12773N/A- if (old_setting == '0' and new_setting != '0'):

12773N/A- # We have just enabled print queue sharing.

12773N/A- # Ideally, this is the time we would check the firewall

10139N/A- # settings on this machine and request that the IPP TCP port

10139N/A- # be unblocked. Unfortunately, this is not yet possible

10139N/A- # (bug #440469). However, we can display a dialog to suggest

10139N/A- # that now might be a good time to review the firewall settings.

10139N/A- show_info_dialog (_("Review Firewall"),

10139N/A- _("You may need to adjust the firewall "

18118N/A- "to allow network printing to this "

18118N/A- "computer.") + '\n\n' +

10139N/A- TEXT_start_firewall_tool,

10139N/A- parent=self.ServerSettingsDialog)

10139N/A-

10139N/A- time.sleep(1) # give the server a chance to process our request

10139N/A-

10139N/A # Now reconnect, in case the server needed to reload.

10139N/A self.reconnect ()

10139N/A

10139N/Adiff -urN system-config-printer-1.0.12/troubleshoot/SchedulerNotRunning.py ../SUNWcups-manager-2.24.2.hacked/system-config-printer-1.0.12/troubleshoot/SchedulerNotRunning.py

10139N/A--- system-config-printer-1.0.12/troubleshoot/SchedulerNotRunning.py 2008-11-30 12:49:45.000000000 +0000

10139N/A+++ ../SUNWcups-manager-2.24.2.hacked/system-config-printer-1.0.12/troubleshoot/SchedulerNotRunning.py 2008-12-12 15:47:02.904322000 +0000

10139N/A@@ -25,11 +25,12 @@ class SchedulerNotRunning(Question):

10139N/A def __init__ (self, troubleshooter):

10139N/A Question.__init__ (self, troubleshooter, "Scheduler not running?")

10139N/A page = self.initial_vbox (_("CUPS Service Stopped"),

10139N/A+ # SUN_BRANDING

10139N/A _("The CUPS print spooler does not appear "

10139N/A- "to be running. To correct this, choose "

10139N/A- "System->Administration->Services from "

10139N/A- "the main menu and look for the `cups' "

10139N/A- "service."))

10139N/A+ "to be running. To correct this, "

10139N/A+ "run '/usr/sbin/print-service -s cups' "

10139N/A+ "as a privileged user "

10139N/A+ "in a terminal."))

10139N/A troubleshooter.new_page (page, self)

10139N/A

10139N/A def display (self):

10139N/Adiff -urN system-config-printer-1.0.12/troubleshoot/base.py ../SUNWcups-manager-2.24.2.hacked/system-config-printer-1.0.12/troubleshoot/base.py

10139N/A--- system-config-printer-1.0.12/troubleshoot/base.py 2008-11-30 12:49:45.000000000 +0000

10139N/A+++ ../SUNWcups-manager-2.24.2.hacked/system-config-printer-1.0.12/troubleshoot/base.py 2008-12-12 15:28:16.269370000 +0000

10139N/A@@ -30,8 +30,9 @@

10139N/A 'Multichoice',

18118N/A 'TEXT_start_print_admin_tool' ]

10139N/A

10139N/A+ # SUN_BRANDING

10139N/A TEXT_start_print_admin_tool = _("To start this tool, select "

10139N/A- "System->Administration->Printing "

10139N/A+ "System->Administration->Print Manager "

10139N/A "from the main menu.")

17903N/A

17903N/A class Question:

17903N/A