- Make sure serial device widgets are always initialized (bug #556488).

This commit is contained in:
Tim Waugh 2010-01-18 17:06:12 +00:00
parent 42767d652c
commit 22080998fa
3 changed files with 17 additions and 1 deletions

2
clog1
View File

@ -1,2 +1,2 @@
* Mon Jan 18 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-9 * Mon Jan 18 2010 Tim Waugh <twaugh@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).

View File

@ -0,0 +1,13 @@
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])

View File

@ -29,6 +29,7 @@ Patch11: system-config-printer-copy-crash.patch
Patch12: system-config-printer-check-still-connecting.patch Patch12: system-config-printer-check-still-connecting.patch
Patch13: system-config-printer-async-fallback.patch Patch13: system-config-printer-async-fallback.patch
Patch14: system-config-printer-userdefault-traceback.patch Patch14: system-config-printer-userdefault-traceback.patch
Patch15: system-config-printer-serial-widgets.patch
Patch101: pycups-request-readio.patch Patch101: pycups-request-readio.patch
@ -104,6 +105,7 @@ printers.
%patch12 -p1 -b .check-still-connecting %patch12 -p1 -b .check-still-connecting
%patch13 -p1 -b .async-fallback %patch13 -p1 -b .async-fallback
%patch14 -p1 -b .userdefault-traceback %patch14 -p1 -b .userdefault-traceback
%patch15 -p1 -b .serial-widgets
pushd pycups-%{pycups_version} pushd pycups-%{pycups_version}
%patch101 -p1 -b .request-readio %patch101 -p1 -b .request-readio
@ -225,6 +227,7 @@ exit 0
%changelog %changelog
* Mon Jan 18 2010 Tim Waugh <twaugh@redhat.com> - 1.1.16-9 * Mon Jan 18 2010 Tim Waugh <twaugh@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). - Handle errors more gracefully in userdefault.py (bug #556345).
- Don't rely on cups-pk-helper being around (bug #556170). - Don't rely on cups-pk-helper being around (bug #556170).
- Avoid traceback when checking on connecting backends (bug #555552). - Avoid traceback when checking on connecting backends (bug #555552).