rpms/system-config-printer/devel system-config-printer-data-button-state.patch, NONE, 1.1 system-config-printer.spec, 1.293, 1.294

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-data-button-state.patch 
Log Message:
* Fri Sep 18 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-04 18:12:11.000000000 +0100
+++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:04:40.062438371 +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/devel/system-config-printer.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- system-config-printer.spec	14 Sep 2009 15:07:15 -0000	1.293
+++ system-config-printer.spec	18 Sep 2009 12:10:03 -0000	1.294
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -15,6 +15,8 @@ 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-data-button-state.patch
+
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
 BuildRequires: libsmbclient-devel >= 3.2
@@ -74,6 +76,7 @@ printers.
 
 %prep
 %setup -q -a 1 -a 2
+%patch1 -p1 -b .data-button-state
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -185,6 +188,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Fixed data button state.
+
 * Mon Sep 14 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-1
 - 1.1.13:
   - Translation updates (bug #522451).