rpms/hplip/F-12 hplip-preferences-crash.patch, NONE, 1.1 hplip.spec, 1.253, 1.254

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21111

Modified Files:
	hplip.spec 
Added Files:
	hplip-preferences-crash.patch 
Log Message:
* Wed Jan 20 2010 Tim Waugh <twaugh at redhat.com> - 3.9.8-28
- Fixed crash when using Preferences dialog (bug #555979).


hplip-preferences-crash.patch:
 devmgr5.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hplip-preferences-crash.patch ---
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)
 
 
     # ***********************************************************************************


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-12/hplip.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- hplip.spec	12 Jan 2010 19:55:12 -0000	1.253
+++ hplip.spec	20 Jan 2010 12:25:22 -0000	1.254
@@ -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 at redhat.com> - 3.9.8-28
+- Fixed crash when using Preferences dialog (bug #555979).
+
 * Tue Jan 12 2010 Tim Waugh <twaugh at redhat.com> - 3.9.8-27
 - Do ship pkit module even though the PolicyKit mechanism is not
   shipped (bug #554817).