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

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21336

Modified Files:
	hplip.spec 
Added Files:
	hplip-preferences-crash.patch 
Log Message:
* Wed Jan 20 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-4
- 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.12/ui4/devmgr5.py.preferences-crash hplip-3.9.12/ui4/devmgr5.py
--- hplip-3.9.12/ui4/devmgr5.py.preferences-crash	2009-12-15 21:22:17.000000000 +0000
+++ hplip-3.9.12/ui4/devmgr5.py	2010-01-20 12:21:27.794561868 +0000
@@ -2020,7 +2020,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/devel/hplip.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -p -r1.253 -r1.254
--- hplip.spec	12 Jan 2010 19:56:04 -0000	1.253
+++ hplip.spec	20 Jan 2010 12:28:36 -0000	1.254
@@ -13,6 +13,7 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
+Patch1: hplip-preferences-crash.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
@@ -109,6 +110,9 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Fixed crash when using Preferences dialog (bug #555979).
+%patch1 -p1 -b .preferences-crash
+
 # Fix compilation.
 %patch2 -p1 -b .strstr-const
 
@@ -338,6 +342,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Jan 20 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-4
+- Fixed crash when using Preferences dialog (bug #555979).
+
 * Tue Jan 12 2010 Tim Waugh <twaugh at redhat.com> - 3.9.12-3
 - Do ship pkit module even though the PolicyKit mechanism is not
   shipped (bug #554817).