rpms/system-config-printer/F-11 system-config-printer-data-button-state.patch, NONE, 1.1 system-config-printer.spec, 1.287, 1.288

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24448

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-data-button-state.patch 
Log Message:
* Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Fixed data button state.


system-config-printer-data-button-state.patch:
 system-config-printer.py |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE system-config-printer-data-button-state.patch ---
diff -up system-config-printer-1.1.13/system-config-printer.py.data-button-state system-config-printer-1.1.13/system-config-printer.py
--- system-config-printer-1.1.13/system-config-printer.py.data-button-state	2009-09-22 11:06:43.573668929 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-22 11:07:08.140669325 +0100
@@ -1907,19 +1907,20 @@ class GUI(GtkGUI, monitor.Watcher):
     # set buttons sensitivity
     def setDataButtonState(self):
         try:
-            possible = (self.ppd and
-                        not bool (self.changed) and
-                        self.printer.enabled and
-                        not self.printer.rejecting)
+            printable = (self.ppd and
+                         not bool (self.changed) and
+                         self.printer.enabled and
+                         not self.printer.rejecting)
 
-            self.btnPrintTestPage.set_sensitive (possible)
+            self.btnPrintTestPage.set_sensitive (printable)
+            adjustable = not (self.discovered or bool (self.changed))
             for button in [self.btnChangePPD,
                            self.btnSelectDevice]:
-                button.set_sensitive (not bool (self.changed))
+                button.set_sensitive (adjustable)
 
             commands = (self.printer.type & cups.CUPS_PRINTER_COMMANDS) != 0
-            self.btnSelfTest.set_sensitive (commands and possible)
-            self.btnCleanHeads.set_sensitive (commands and possible)
+            self.btnSelfTest.set_sensitive (commands and printable)
+            self.btnCleanHeads.set_sensitive (commands and printable)
         except:
             pass
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-11/system-config-printer.spec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -p -r1.287 -r1.288
--- system-config-printer.spec	22 Sep 2009 10:06:35 -0000	1.287
+++ system-config-printer.spec	22 Sep 2009 10:09:06 -0000	1.288
@@ -15,8 +15,9 @@ Source0: http://cyberelk.net/tim/data/sy
 Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
-Patch1: system-config-printer-fetchdevices.patch
-Patch2: system-config-printer-missing-import.patch
+Patch1: system-config-printer-data-button-state.patch
+Patch5: system-config-printer-fetchdevices.patch
+Patch6: system-config-printer-missing-import.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -65,8 +66,9 @@ the configuration tool.
 
 %prep
 %setup -q -a 1 -a 2
-%patch1 -p1 -b .fetchdevices
-%patch2 -p1 -b .missing-import
+%patch1 -p1 -b .data-button-state
+%patch5 -p1 -b .fetchdevices
+%patch6 -p1 -b .missing-import
 
 %build
 %configure
@@ -169,6 +171,7 @@ exit 0
 
 %changelog
 * Tue Sep 22 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed data button state.
 - Fixed missing import in probe_printer module.
 - Fixed race when fetching device list (bug #521110).