summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch')
-rw-r--r--kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch b/kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch
deleted file mode 100644
index 8f97cb41b979..000000000000
--- a/kde-base/kdelibs/files/kdelibs-3.5.0-kicker-crash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: kio/kio/kdirlister.cpp
-===================================================================
---- kio/kio/kdirlister.cpp (revision 479279)
-+++ kio/kio/kdirlister.cpp (revision 479280)
-@@ -415,8 +415,11 @@
- url.adjustPath( -1 );
- QString urlStr = url.url();
- QPtrList<KDirLister> *holders = urlsCurrentlyHeld[urlStr];
-- Q_ASSERT( holders );
-- holders->removeRef( lister );
-+ //Q_ASSERT( holders );
-+ if ( holders )
-+ {
-+ holders->removeRef( lister );
-+ }
-
- // remove the dir from lister->d->lstDirs so that it doesn't contain things
- // that itemsInUse doesn't. When emitting the canceled signals lstDirs must
-@@ -425,9 +428,8 @@
- lister->d->lstDirs.remove( lister->d->lstDirs.find( url ) );
-
- DirItem *item = itemsInUse[urlStr];
-- Q_ASSERT( item );
-
-- if ( holders->isEmpty() )
-+ if ( holders && holders->isEmpty() )
- {
- urlsCurrentlyHeld.remove( urlStr ); // this deletes the (empty) holders list
- if ( !urlsCurrentlyListed[urlStr] )
-@@ -454,7 +456,7 @@
- if ( notify )
- emit lister->clear( url );
-
-- if ( item->complete )
-+ if ( item && item->complete )
- {
- kdDebug(7004) << k_funcinfo << lister << " item moved into cache: " << url << endl;
- itemsCached.insert( urlStr, item ); // TODO: may return false!!