From 22080998fa9d184c9b1985e214ad269dc333015a Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 18 Jan 2010 17:06:12 +0000 Subject: [PATCH] - Make sure serial device widgets are always initialized (bug #556488). --- clog1 | 2 +- system-config-printer-serial-widgets.patch | 13 +++++++++++++ system-config-printer.spec | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 system-config-printer-serial-widgets.patch diff --git a/clog1 b/clog1 index 68855c2..c514542 100644 --- a/clog1 +++ b/clog1 @@ -1,2 +1,2 @@ * Mon Jan 18 2010 Tim Waugh - 1.1.16-9 -- Handle errors more gracefully in userdefault.py (bug #556345). +- Make sure serial device widgets are always initialized (bug #556488). diff --git a/system-config-printer-serial-widgets.patch b/system-config-printer-serial-widgets.patch new file mode 100644 index 0000000..044a909 --- /dev/null +++ b/system-config-printer-serial-widgets.patch @@ -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]) diff --git a/system-config-printer.spec b/system-config-printer.spec index 8033c82..781f400 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -29,6 +29,7 @@ Patch11: system-config-printer-copy-crash.patch 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 - 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).