rpms/system-config-printer/F-12 system-config-printer-ink-levels.patch, NONE, 1.1 system-config-printer.spec, 1.336, 1.337

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-ink-levels.patch 
Log Message:
* Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
- Make sure there are enough ink level values (bug #541882).


system-config-printer-ink-levels.patch:
 system-config-printer.py |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE system-config-printer-ink-levels.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.ink-levels system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.ink-levels	2010-01-06 15:49:08.433408576 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2010-01-06 15:50:54.892284445 +0000
@@ -2505,6 +2505,7 @@ class GUI(GtkGUI, monitor.Watcher):
             self.vboxMarkerLevels.remove (widget)
 
         marker_info = dict()
+        num_markers = 0
         for (attr, typ) in [('marker-colors', str),
                             ('marker-names', str),
                             ('marker-types', str),
@@ -2521,10 +2522,18 @@ class GUI(GtkGUI, monitor.Watcher):
                 except TypeError, s:
                     debugprint ("%s value not coercible to %s: %s" %
                                 (attr, typ, s))
-                    val = []
+                    val = map (lambda x: 0.0, val)
 
             marker_info[attr] = val
+            if num_markers == 0 or len (val) < num_markers:
+                num_markers = len (val)
 
+        for attr in ['marker-colors', 'marker-names',
+                     'marker-types', 'marker-levels']:
+            if len (marker_info[attr]) > num_markers:
+                debugprint ("Trimming %s from %s" %
+                            (marker_info[attr][num_markers:], attr))
+                del marker_info[attr][num_markers:]
 
         markers = map (lambda color, name, type, level:
                            (color, name, type, level),


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -p -r1.336 -r1.337
--- system-config-printer.spec	6 Jan 2010 15:50:35 -0000	1.336
+++ system-config-printer.spec	6 Jan 2010 15:54:16 -0000	1.337
@@ -23,6 +23,7 @@ Patch5: system-config-printer-jobviewer-
 Patch6: system-config-printer-npinit-traceback.patch
 Patch7: system-config-printer-notification-timeouts.patch
 Patch8: system-config-printer-select-nonexistent-printer.patch
+Patch9: system-config-printer-ink-levels.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -90,6 +91,7 @@ printers.
 %patch6 -p1 -b .npinit-traceback
 %patch7 -p1 -b .notification-timeouts
 %patch8 -p1 -b .select-nonexistent-printer
+%patch9 -p1 -b .ink-levels
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -207,6 +209,7 @@ exit 0
 
 %changelog
 * Wed Jan  6 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-3
+- Make sure there are enough ink level values (bug #541882).
 - Make sure the printer we added still exists before selecting it
   (bug #551436).
 - Set notification timeouts appropriately (bug #550829).