rpms/kdebase3/devel kdebase-3.5.8-kded-crash-logout.patch, NONE, 1.1 kdebase3.spec, 1.13, 1.14

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.8-kded-crash-logout.patch 
Log Message:
Sync from F8:
* Fri Dec 21 2007 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.8-26
- fix kded crash on logout (#426459)

kdebase-3.5.8-kded-crash-logout.patch:

--- NEW FILE kdebase-3.5.8-kded-crash-logout.patch ---
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
--- kioslave/media/mediamanager/halbackend.cpp	(revision 724099)
+++ kioslave/media/mediamanager/halbackend.cpp	(revision 724100)
@@ -74,7 +74,10 @@
         const QPtrList<Medium> medlist = m_mediaList.list();
         QPtrListIterator<Medium> it (medlist);
         for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it)
-	    unmount(current_medium->id());
+        {
+            if( !current_medium->id().startsWith( "/org/kde" ))
+                unmount(current_medium->id());
+        }
 
 
         /* Remove all the registered media first */


Index: kdebase3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kdebase3.spec	18 Dec 2007 12:43:12 -0000	1.13
+++ kdebase3.spec	22 Dec 2007 20:03:07 -0000	1.14
@@ -22,7 +22,7 @@
 %endif
 
 Version: 3.5.8
-Release: 25%{?dist}
+Release: 26%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -89,6 +89,7 @@
 Patch31: kdebase-3.5.7-konsolesu.patch
 Patch32: kdebase-3.5.8-flash.patch
 Patch33: kdebase-3.5.8-klipper-firefox.patch
+Patch34: kdebase-3.5.8-kded-crash-logout.patch
 
 # upstream patches
 # alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
@@ -303,6 +304,7 @@
 %patch31 -p1 -b .konsolesu-kdesu
 %patch32 -p1 -b .flash
 %patch33 -p1 -b .klipper-firefox
+%patch34 -p0 -b .kded-crash-logout
 
 ## alternative to patch29, requires qt-copy 0078-argb-visual-hack.patch
 #patch200 -p4 -b .kde#83974
@@ -784,6 +786,9 @@
 
 
 %changelog
+* Fri Dec 21 2007 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.8-26
+- fix kded crash on logout (#426459)
+
 * Tue Dec 18 2007 Lukas Tinkl <ltinkl at redhat.com> - 3.5.8-25
 - fix Firefox detection in Klipper (#377171)