diff options
Diffstat (limited to 'x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp')
| -rw-r--r-- | x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 210698a0b31a..5861ae9e7bff 100644 --- a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -1,5 +1,5 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 +--- kioslave/media/mediamanager/fstabbackend.cpp 2006/03/23 09:19:38 521680 ++++ kioslave/media/mediamanager/fstabbackend.cpp 2006/06/14 09:11:46 551306 @@ -144,7 +144,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) @@ -9,26 +9,46 @@ KMountPoint::List mtab = KMountPoint::currentMountPoints(); KMountPoint::List::iterator it = mtab.begin(); -@@ -158,14 +158,6 @@ - - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; - -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; +@@ -162,18 +162,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 +212,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 +218,6 @@ +@@ -226,7 +231,6 @@ } m_mtabIds = new_mtabIds; - m_mtabEntries = new_mtabEntries; } - void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file + void FstabBackend::handleFstabChange(bool allowNotification) |