--- kdebase-3.1.3/kioslave/devices/kdedmodule/disklist.cpp-- 2003-09-17 19:30:45.000000000 -0400 +++ kdebase-3.1.3/kioslave/devices/kdedmodule/disklist.cpp 2003-09-17 19:31:36.000000000 -0400 @@ -39,7 +39,6 @@ #include <mntent.h> #endif - /*************************************************************************** * constructor **/ @@ -209,7 +208,10 @@ int DiskList::parseMountFile( bool mtab replaceDeviceEntry(disk); } else + { + delete disk; + } } } else @@ -220,7 +222,10 @@ int DiskList::parseMountFile( bool mtab replaceDeviceEntryMounted(disk); } else + { + delete disk; + } } } //if not empty @@ -329,9 +334,22 @@ void DiskList::replaceDeviceEntryMounted } } if (pos==-1) - disks->append(disk); + { + if( (disk->fsType()=="nfs") + ||(disk->mountOptions().find("user")!=-1) + || (disk->fsType()=="supermount" && disk->deviceName()=="none")) + { + + + disks->append(disk); + } + else + delete disk; + } else + { delete disk; + } } /*************************************************************************** @@ -445,9 +463,14 @@ void DiskList::replaceDeviceEntry(DiskEn if( (disk->fsType()=="supermount" ) || (disk->fsType().find("nfs",0,FALSE)!=-1 ) || (disk->mountOptions().find("user")!=-1)) + { disks->append(disk); + } else + { + delete disk; + } }//if //#endif }