- Prevent traceback when no downloadable driver selected (#548449).

This commit is contained in:
Jiří Popelka 2009-12-18 10:57:57 +00:00
parent 3bb63b5811
commit 5fb6c1cd7d
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,20 @@
diff -up system-config-printer-1.1.15/system-config-printer.py.selection-browse system-config-printer-1.1.15/system-config-printer.py
--- system-config-printer-1.1.15/system-config-printer.py.selection-browse 2009-12-16 16:54:39.000000000 +0100
+++ system-config-printer-1.1.15/system-config-printer.py 2009-12-18 11:46:36.000000000 +0100
@@ -646,6 +646,7 @@ class GUI(GtkGUI, monitor.Watcher):
# setup some lists
m = gtk.SELECTION_MULTIPLE
s = gtk.SELECTION_SINGLE
+ b = gtk.SELECTION_BROWSE
for name, treeview, selection_mode in (
(_("Members of this class"), self.tvClassMembers, m),
(_("Others"), self.tvClassNotMembers, m),
@@ -656,7 +657,7 @@ class GUI(GtkGUI, monitor.Watcher):
(_("Makes"), np.tvNPMakes,s),
(_("Models"), np.tvNPModels,s),
(_("Drivers"), np.tvNPDrivers,s),
- (_("Downloadable Drivers"), np.tvNPDownloadableDrivers,s),
+ (_("Downloadable Drivers"), np.tvNPDownloadableDrivers, b),
(_("Users"), self.tvPUsers, m),
):

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.1.15
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
@ -23,6 +23,7 @@ Patch5: system-config-printer-troubleshooter-traceback.patch
Patch6: system-config-printer-lpd-uri.patch
Patch7: system-config-printer-short-lived-states.patch
Patch8: system-config-printer-troubleshooter-debugcancel.patch
Patch9: system-config-printer-selection-browse.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: python-devel >= 2.4
@ -90,6 +91,7 @@ printers.
%patch6 -p1 -b .lpd-uri
%patch7 -p1 -b .short-lived-states
%patch8 -p1 -b .troubleshooter-debugcancel
%patch9 -p1 -b .selection-browse
%build
%configure --with-udev-rules --with-polkit-1
@ -202,6 +204,9 @@ rm -rf %buildroot
exit 0
%changelog
* Fri Dec 18 2009 Jiri Popelka <jpopelka@redhat.com> 1.1.15-9
- Prevent traceback when no downloadable driver selected (#548449).
* Mon Dec 14 2009 Jiri Popelka <jpopelka@redhat.com> 1.1.15-8
- Prevent traceback when cancel button in troubleshooter pressed (#546821).