diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-06-16 07:19:46 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-06-16 07:19:46 +0000 |
| commit | ff37c611b5ee3e92fb0e331796edad1cdf3649c9 (patch) | |
| tree | f97a1e712518c97b79f25b992d07a24c944fde9d /x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp | |
| parent | - Update to 1.2.9 (diff) | |
- Fix KDE Bug 128754 (media:/ confuses filedescriptor devices with floppies)
- Correct pkg-message (noticed by ale@)
PR: ports/98591
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 | 20 |
1 files changed, 14 insertions, 6 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 5861ae9e7bff..5fb2c123a6c2 100644 --- a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -1,6 +1,14 @@ ---- 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 @@ +--- kioslave/media/mediamanager/fstabbackend.cpp.orig Mon May 22 20:12:42 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Fri Jun 16 08:56:20 2006 +@@ -111,6 +111,7 @@ + if ( mount->mountType() == "swap" + || mount->mountType() == "tmpfs" + || mount->mountType() == "sysfs" ++ || mount->mountType() == "fdescfs" + || mount->mountType() == "kernfs" + || mount->mountType() == "usbfs" + || mount->mountType().contains( "proc" ) +@@ -144,7 +145,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) { @@ -9,7 +17,7 @@ KMountPoint::List mtab = KMountPoint::currentMountPoints(); KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +162,19 @@ +@@ -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; @@ -33,7 +41,7 @@ m_mediaList.changeMediumState(id, true, false, mime, icon, label); } -@@ -211,6 +212,10 @@ +@@ -211,6 +213,10 @@ QString mp = medium->mountPoint(); QString fs = medium->fsType(); @@ -44,7 +52,7 @@ QString mime, icon, label; guess(dev, mp, fs, false, mime, icon, label); -@@ -226,7 +231,6 @@ +@@ -226,7 +232,6 @@ } m_mtabIds = new_mtabIds; |