rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Fixed crash when using Preferences dialog (bug #555979).

Browse Source
This commit is contained in:
Tim Waugh 2010-01-20 12:25:22 +00:00
parent 3de0019f24
commit 9b5905ea41
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hplip-preferences-crash.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up hplip-3.9.8/ui4/devmgr5.py.preferences-crash hplip-3.9.8/ui4/devmgr5.py
--- hplip-3.9.8/ui4/devmgr5.py.preferences-crash 2009-08-04 22:37:22.000000000 +0100
+++ hplip-3.9.8/ui4/devmgr5.py 2010-01-20 12:10:15.728561588 +0000
@@ -2019,7 +2019,9 @@ class DevMgr5(QMainWindow, Ui_MainWindo
if dlg.exec_() == QDialog.Accepted:
self.user_settings.load()
- self.cur_device.sendEvent(EVENT_USER_CONFIGURATION_CHANGED, self.cur_printer)
+ if self.cur_device is not None:
+ self.cur_device.sendEvent(EVENT_USER_CONFIGURATION_CHANGED,
+ self.cur_printer)
# ***********************************************************************************

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.9.8 Version: 3.9.8
Release: 27%{?dist} Release: 28%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -28,6 +28,7 @@ Patch13: hplip-plugin-error.patch
Patch14: hplip-hpcups-sigpipe.patch Patch14: hplip-hpcups-sigpipe.patch
Patch15: hplip-hpcups-plugin.patch Patch15: hplip-hpcups-plugin.patch
Patch16: hplip-bad-low-ink-warning.patch Patch16: hplip-bad-low-ink-warning.patch
Patch17: hplip-preferences-crash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): /sbin/service Requires(pre): /sbin/service
@ -163,6 +164,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
%patch16 -p1 -b .bad-low-ink-warning %patch16 -p1 -b .bad-low-ink-warning
# Fixed crash when using Preferences dialog (bug #555979).
%patch17 -p1 -b .preferences-crash
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -369,6 +373,9 @@ fi
/usr/bin/update-desktop-database &>/dev/null ||: /usr/bin/update-desktop-database &>/dev/null ||:
%changelog %changelog
* Wed Jan 20 2010 Tim Waugh <twaugh@redhat.com> - 3.9.8-28
- Fixed crash when using Preferences dialog (bug #555979).
* Tue Jan 12 2010 Tim Waugh <twaugh@redhat.com> - 3.9.8-27 * Tue Jan 12 2010 Tim Waugh <twaugh@redhat.com> - 3.9.8-27
- Do ship pkit module even though the PolicyKit mechanism is not - Do ship pkit module even though the PolicyKit mechanism is not
shipped (bug #554817). shipped (bug #554817).