rpms/kdebase3/devel kdebase-3.5-khotkeys-crash.patch, NONE, 1.1 kdebase3.spec, 1.44, 1.45

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23291/devel

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5-khotkeys-crash.patch 
Log Message:
Sync from F8:

* Mon Mar 03 2008 Than Ngo <than at redhat.com> 3.5.9-4
- 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: khotkeys/kcontrol/actions_listview_widget.cpp
===================================================================
--- khotkeys/kcontrol/actions_listview_widget.cpp	(Revision 781557)
+++ khotkeys/kcontrol/actions_listview_widget.cpp	(Revision 781558)
@@ -110,6 +110,7 @@
 //    if( nw == NULL )
 //        nw = current_action()->itemBelow();
     delete saved_current_item;
+    saved_current_item = NULL;
     recent_item = NULL;
 //    if( nw != NULL )
 //        {


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kdebase3.spec	28 Feb 2008 18:24:20 -0000	1.44
+++ kdebase3.spec	7 Mar 2008 22:30:14 -0000	1.45
@@ -12,7 +12,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -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
@@ -793,6 +795,9 @@
 
 
 %changelog
+* Mon Mar 03 2008 Than Ngo <than at redhat.com> 3.5.9-4
+- apply upstream patch to fix crash in khotkey
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-3
 - apply upstream patch to unbreak lmsensors support again