rpms/kdebase-workspace/devel kdebase-workspace-4.0.x-kcontrol-crash.patch, NONE, 1.1 kdebase-workspace.spec, 1.41, 1.42

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29665

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.0.x-kcontrol-crash.patch 
Log Message:
apply upstream patch to fix crash in khotkeys


kdebase-workspace-4.0.x-kcontrol-crash.patch:

--- NEW FILE kdebase-workspace-4.0.x-kcontrol-crash.patch ---
Index: workspace/khotkeys/kcontrol/condition_list_widget.cpp
===================================================================
--- workspace/khotkeys/kcontrol/condition_list_widget.cpp	(Revision 781668)
+++ workspace/khotkeys/kcontrol/condition_list_widget.cpp	(Revision 781669)
@@ -226,10 +226,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-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- kdebase-workspace.spec	29 Feb 2008 22:05:31 -0000	1.41
+++ kdebase-workspace.spec	3 Mar 2008 13:38:38 -0000	1.42
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.2
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -18,6 +18,8 @@
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
 # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
 Patch3: kdebase-workspace-4.0.2-kde#155362.patch
+# upstream patch
+Patch4: kdebase-workspace-4.0.x-kcontrol-crash.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -105,7 +107,7 @@
 # ConsoleKit support for KDM (#228111, kde#147790)
 %patch2 -p1 -b .consolekit
 %patch3 -p1 -b .kde#155362
-
+%patch4 -p0 -b .kcontrol-crash
 
 %build
 
@@ -218,6 +220,9 @@
 
 
 %changelog
+* Mon Mar 03 2008 Than Ngo <than at redhat.com> 4.0.2-3
+- apply upstream patch to fix crash in khotkeys
+
 * Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
 - drop upstreamed kde#155974 patch
 - update kde#155362 patch