Don't delete mainlist too early when quitting (bug #915483).

This commit is contained in:
Tim Waugh 2013-04-12 12:07:00 +01:00
parent d752c46786
commit c052e62fbb
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,17 @@
diff -up system-config-printer-1.4.0/system-config-printer.py.quit system-config-printer-1.4.0/system-config-printer.py
--- system-config-printer-1.4.0/system-config-printer.py.quit 2013-04-12 12:05:58.441494614 +0100
+++ system-config-printer-1.4.0/system-config-printer.py 2013-04-12 12:06:05.500559576 +0100
@@ -1230,11 +1230,11 @@ class GUI(GtkGUI):
while len (self.jobviewers) > 0:
# this will call on_jobviewer_exit
self.jobviewers[0].on_delete_event ()
- del self.mainlist
- del self.printers
self.propertiesDlg.destroy ()
self.newPrinterGUI.destroy ()
Gtk.main_quit()
+ del self.mainlist
+ del self.printers
# Rename
def is_rename_possible (self, name):

View File

@ -1,7 +1,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.4.0 Version: 1.4.0
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -9,6 +9,7 @@ Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{versio
Patch1: system-config-printer-no-applet-in-gnome.patch Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-DISPLAY.patch Patch2: system-config-printer-DISPLAY.patch
Patch3: system-config-printer-encoding.patch Patch3: system-config-printer-encoding.patch
Patch4: system-config-printer-quit.patch
BuildRequires: cups-devel >= 1.2 BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
@ -73,6 +74,9 @@ printers.
# Fixed some printer name encoding issues (bug #950162). # Fixed some printer name encoding issues (bug #950162).
%patch3 -p1 -b .encoding %patch3 -p1 -b .encoding
# Don't delete mainlist too early when quitting (bug #915483).
%patch4 -p1 -b .quit
%build %build
%configure --with-udev-rules %configure --with-udev-rules
@ -172,6 +176,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
exit 0 exit 0
%changelog %changelog
* Fri Apr 12 2013 Tim Waugh <twaugh@redhat.com> 1.4.0-3
- Don't delete mainlist too early when quitting (bug #915483).
* Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com> 1.4.0-2 * Thu Apr 11 2013 Tim Waugh <twaugh@redhat.com> 1.4.0-2
- Fixed changelog date. - Fixed changelog date.
- Fixed some printer name encoding issues (bug #950162). - Fixed some printer name encoding issues (bug #950162).