rpms/system-config-printer/devel system-config-printer-serial-widgets.patch, NONE, 1.1 clog1, 1.3, 1.4 system-config-printer.spec, 1.344, 1.345

[Tim Waugh]

Author: twaugh

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

Modified Files:
	clog1 system-config-printer.spec 
Added Files:
	system-config-printer-serial-widgets.patch 
Log Message:
* Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
- Make sure serial device widgets are always initialized (bug #556488).


system-config-printer-serial-widgets.patch:
 system-config-printer.py |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE system-config-printer-serial-widgets.patch ---
diff -up system-config-printer-1.1.16/system-config-printer.py.serial-widgets system-config-printer-1.1.16/system-config-printer.py
--- system-config-printer-1.1.16/system-config-printer.py.serial-widgets	2010-01-18 17:01:04.326559283 +0000
+++ system-config-printer-1.1.16/system-config-printer.py	2010-01-18 17:01:24.700559444 +0000
@@ -5949,6 +5949,9 @@ class NewPrinterGUI(GtkGUI):
                                     break
                                 iter = model.iter_next(iter)
                                 nr += 1
+
+                            if not iter:
+                                widget.set_active (0)
                         else: # use optionvalues
                             nr = optionvalues.index(
                                 option_dict[name])


Index: clog1
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/clog1,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- clog1	18 Jan 2010 17:03:23 -0000	1.3
+++ clog1	18 Jan 2010 17:06:12 -0000	1.4
@@ -1,2 +1,2 @@
 * Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
-- Handle errors more gracefully in userdefault.py (bug #556345).
+- Make sure serial device widgets are always initialized (bug #556488).


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -p -r1.344 -r1.345
--- system-config-printer.spec	18 Jan 2010 17:03:23 -0000	1.344
+++ system-config-printer.spec	18 Jan 2010 17:06:12 -0000	1.345
@@ -29,6 +29,7 @@ Patch11: system-config-printer-copy-cras
 Patch12: system-config-printer-check-still-connecting.patch
 Patch13: system-config-printer-async-fallback.patch
 Patch14: system-config-printer-userdefault-traceback.patch
+Patch15: system-config-printer-serial-widgets.patch
 
 Patch101: pycups-request-readio.patch
 
@@ -104,6 +105,7 @@ printers.
 %patch12 -p1 -b .check-still-connecting
 %patch13 -p1 -b .async-fallback
 %patch14 -p1 -b .userdefault-traceback
+%patch15 -p1 -b .serial-widgets
 
 pushd pycups-%{pycups_version}
 %patch101 -p1 -b .request-readio
@@ -225,6 +227,7 @@ exit 0
 
 %changelog
 * Mon Jan 18 2010 Tim Waugh <twaugh at redhat.com> - 1.1.16-9
+- Make sure serial device widgets are always initialized (bug #556488).
 - Handle errors more gracefully in userdefault.py (bug #556345).
 - Don't rely on cups-pk-helper being around (bug #556170).
 - Avoid traceback when checking on connecting backends (bug #555552).