From 9b5905ea41adc08b57d0046f18de1c227dae55cc Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 20 Jan 2010 12:25:22 +0000
Subject: [PATCH] - Fixed crash when using Preferences dialog (bug #555979).

---
 hplip-preferences-crash.patch | 14 ++++++++++++++
 hplip.spec                    |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 hplip-preferences-crash.patch

diff --git a/hplip-preferences-crash.patch b/hplip-preferences-crash.patch
new file mode 100644
index 0000000..8800d09
--- /dev/null
+++ b/hplip-preferences-crash.patch
@@ -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)
+ 
+ 
+     # ***********************************************************************************
diff --git a/hplip.spec b/hplip.spec
index 83479a6..09cd069 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -28,6 +28,7 @@ Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch15: hplip-hpcups-plugin.patch
 Patch16: hplip-bad-low-ink-warning.patch
+Patch17: hplip-preferences-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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).
 %patch16 -p1 -b .bad-low-ink-warning
 
+# Fixed crash when using Preferences dialog (bug #555979).
+%patch17 -p1 -b .preferences-crash
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -369,6 +373,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %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
 - Do ship pkit module even though the PolicyKit mechanism is not
   shipped (bug #554817).