diff options
Diffstat (limited to 'x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp')
-rw-r--r-- | x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ if(m_mtabEntries.contains(mtabEntry)) { -+ new_mtabIds += m_mtabEntries[mtabEntry]; -+ continue; -+ } - - QString id = generateId(dev, mp); - new_mtabIds+=id; -+ m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -- - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -211,6 +213,10 @@ - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); - -+ -+ QString mtabEntry = dev + "*" + mp + "*" + fs; -+ m_mtabEntries.remove(mtabEntry); -+ - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) |