--- kdebase-3.1.3/kioslave/devices/kdedmodule/disklist.cpp--	2003-09-04 11:54:32.000000000 -0400
+++ kdebase-3.1.3/kioslave/devices/kdedmodule/disklist.cpp	2003-09-04 12:12:36.000000000 -0400
@@ -171,44 +171,6 @@ int DiskList::readFSTAB()
 {
   if (readingDFStdErrOut || dfProc->isRunning()) return -1;
 
-#ifdef HAVE_SETMNTENT
-
-#define SETMNTENT setmntent
-#define ENDMNTENT endmntent
-#define STRUCT_MNTENT struct mntent *
-#define STRUCT_SETMNTENT FILE *
-#define GETMNTENT(file, var) ((var = getmntent(file)) != 0)
-#define MOUNTPOINT(var) var->mnt_dir
-#define MOUNTTYPE(var) var->mnt_type
-#define MOUNTOPTIONS(var) var->mnt_opts
-#define HASMNTOPT(var, opt) hasmntopt(var, opt)
-#define FSNAME(var) var->mnt_fsname
-
-  STRUCT_SETMNTENT fstab;
-  if ((fstab = SETMNTENT(FSTAB, "r")) == 0)
-     return -1;
-
-  STRUCT_MNTENT fe;
-  while (GETMNTENT(fstab, fe))
-  {
-      DiskEntry *disk = new DiskEntry();
-      disk->setMounted(FALSE);
-      disk->setDeviceName(QFile::decodeName(FSNAME(fe)));
-      //kdDebug() << "    deviceName:    [" << disk->deviceName() << "]" << endl;
-      disk->setMountPoint(QFile::decodeName(MOUNTPOINT(fe)));
-      //kdDebug() << "    MountPoint:    [" << disk->mountPoint() << "]" << endl;
-      disk->setFsType(QFile::decodeName(MOUNTTYPE(fe)));
-      //kdDebug() << "    FS-Type:       [" << disk->fsType() << "]" << endl;
-      disk->setMountOptions(QFile::decodeName(MOUNTOPTIONS(fe)));
-      //kdDebug() << "    Mount-Options: [" << disk->mountOptions() << "]" << endl;
-      if (!ignoreDisk(disk))
-         replaceDeviceEntry(disk);
-      else
-         delete disk;
-  }
-  ENDMNTENT(fstab);
-
-#else
   QFile f(FSTAB);
   if ( f.open(IO_ReadOnly) ) {
     QTextStream t (&f);
@@ -259,7 +221,6 @@ int DiskList::readFSTAB()
     } //while
     f.close();
   } //if f.open
-#endif
 
   loadSettings(); //to get the mountCommands
   return 1;
@@ -432,6 +393,8 @@ void DiskList::dfDone()
      {
  	if ( disk->fsType()=="supermount" && disk->deviceName() == "none")
  	{
+            disk->setMounted(TRUE);
+#if 0
              QDir dir(disk->mountPoint());
              QStringList files = dir.entryList();
              for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it )
@@ -442,6 +405,7 @@ void DiskList::dfDone()
                      break;
                  }
              }
+#endif
  	}
      }