rpms/kdebase/F-7 kdebase-3.5-khotkeys-crash.patch, NONE, 1.1 kdebase.spec, 1.272, 1.273

Than Ngo (than) fedora-extras-commits at redhat.com
Mon Mar 3 13:47:16 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdebase/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29906

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5-khotkeys-crash.patch 
Log Message:
apply upstream patch to fix crash in khotkey


kdebase-3.5-khotkeys-crash.patch:

--- NEW FILE kdebase-3.5-khotkeys-crash.patch ---
Index: khotkeys/kcontrol/condition_list_widget.cpp
===================================================================
--- khotkeys/kcontrol/condition_list_widget.cpp	(Revision 781669)
+++ khotkeys/kcontrol/condition_list_widget.cpp	(Revision 781670)
@@ -221,10 +221,14 @@
     }
 
 void Condition_list_widget::delete_pressed()
+{
+    if ( selected_item )
     {
-    conditions.remove( selected_item->condition()); // we own it
-    delete selected_item; // CHECKME snad vyvola signaly pro enable()
+        conditions.remove( selected_item->condition()); // we own it
+        delete selected_item; // CHECKME snad vyvola signaly pro enable()
+        selected_item = NULL;
     }
+}
 
 void Condition_list_widget::modify_pressed()
     {


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-7/kdebase.spec,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -r1.272 -r1.273
--- kdebase.spec	28 Feb 2008 18:26:26 -0000	1.272
+++ kdebase.spec	3 Mar 2008 13:46:36 -0000	1.273
@@ -85,6 +85,7 @@
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 Patch200: kdebase-3.5.7-kde#83974.patch
 Patch201: kdebase-3.5.9-lmsensors.patch
+Patch202: kdebase-3.5-khotkeys-crash.patch
 
 # security fixes
 
@@ -297,6 +298,7 @@
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
 %patch201 -p0 -b .sensor
+%patch202 -p0 -b .khotkeys-crash
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -795,6 +797,7 @@
 %changelog
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-3
 - apply upstream patch to unbreak lmsensors support again
+- apply upstream patch to fix crash in khotkey
 
 * Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-2
 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help




More information about the fedora-extras-commits mailing list