rpms/hplip/F-11 hplip-preferences-crash.patch, NONE, 1.1 hplip.spec, 1.243, 1.244

[Tim Waugh]

Author: twaugh

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

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-25
- 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-11/hplip.spec,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- hplip.spec	12 Jan 2010 19:54:02 -0000	1.243
+++ hplip.spec	20 Jan 2010 12:25:16 -0000	1.244
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -21,6 +21,7 @@ Patch4: hplip-no-asm.patch
 Patch5: hplip-clear-previous-state-reasons.patch
 Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
+Patch8: hplip-preferences-crash.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
@@ -138,6 +139,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Fixed typos in page sizes (bug #515469).
 %patch7 -p1 -b .parenths
 
+# Fixed crash when using Preferences dialog (bug #555979).
+%patch8 -p1 -b .preferences-crash
+
 # Set RequiresPageRegion in hpcups PPDs (bug #518756).
 %patch9 -p1 -b .requirespageregion
 
@@ -384,6 +388,9 @@ fi
 exit 0
 
 %changelog
+* Wed Jan 20 2010 Tim Waugh <twaugh at redhat.com> - 3.9.8-25
+- Fixed crash when using Preferences dialog (bug #555979).
+
 * Tue Jan 12 2010 Tim Waugh <twaugh at redhat.com> - 3.9.8-24
 - Do ship pkit module even though the PolicyKit mechanism is not
   shipped (bug #554817).