rpms/kdebase/F-9 kdebase-4.1.1-kde#863180-fileassoc.patch, NONE, 1.1 kdebase.spec, 1.331, 1.332

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28231

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.1.1-kde#863180-fileassoc.patch 
Log Message:
file/service association crash fix


kdebase-4.1.1-kde#863180-fileassoc.patch:

--- NEW FILE kdebase-4.1.1-kde#863180-fileassoc.patch ---
Index: apps/konqueror/settings/filetypes/kservicelistwidget.cpp
===================================================================
--- apps/konqueror/settings/filetypes/kservicelistwidget.cpp	(revision 863179)
+++ apps/konqueror/settings/filetypes/kservicelistwidget.cpp	(revision 863180)
@@ -260,7 +260,7 @@
   }
 
   // if None is the only item, then there currently is no default
-  if (servicesLB->item(0)->text() == i18n("None")) {
+  if (servicesLB->count() >= 1 && servicesLB->item(0)->text() == i18n("None")) {
       delete servicesLB->takeItem(0);
       servicesLB->setEnabled(true);
   }


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-9/kdebase.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- kdebase.spec	29 Aug 2008 18:42:09 -0000	1.331
+++ kdebase.spec	22 Sep 2008 08:20:11 -0000	1.332
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -28,6 +28,7 @@
 Patch1:   kdebase-nsplugins-paths.patch
 
 ## upstream patches
+Patch100: kdebase-4.1.1-kde#863180-fileassoc.patch
 
 BuildRequires: kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -124,6 +125,7 @@
 %prep
 %setup -q -n kdebase-%{version}
 %patch1   -p0 -b .nsplugins-paths
+%patch100 -p0 -b .kde#863180-fileassoc
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
 
@@ -303,6 +305,10 @@
 
 
 %changelog
+* Mon Sep 22 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.1-2
+- Fix crash if you delete all file associations and then add a new one
+  (kdebug:171395)
+
 * Fri Aug 29 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1