--- kdebase-3.1.3/kioslave/devices/kdedmodule/mountwatcher.cpp--	2003-09-04 13:01:55.000000000 -0400
+++ kdebase-3.1.3/kioslave/devices/kdedmodule/mountwatcher.cpp	2003-09-04 13:15:51.000000000 -0400
@@ -248,6 +248,10 @@ void MountWatcherModule::readDFDone()
 	QStringList oldmountList(mountList);
 	mountList.clear();
 	KURL::List fileList;
+        int cdromNb = 1;
+        int cdwriterNb = 1;
+        int floppyNb = 1;
+        int zipNb = 1;
 	for (DiskEntry *ent=mDiskList.first();ent;ent=mDiskList.next())
 	{
 		QString entryName="";
@@ -260,7 +264,62 @@ void MountWatcherModule::readDFDone()
        	        if (ent->mounted())
 		{
 			mountList<<(entryName);
-                 	mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                        if( ent->discType().contains("cdrom"))
+                        {
+                            if( cdromNb == 1)
+                            {
+                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(cdromNb);
+                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                            }
+                            cdromNb++;
+                        }
+                        else if( ent->discType().contains("cdwriter"))
+                        {
+                            if( cdwriterNb == 1)
+                            {
+                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(cdwriterNb);
+                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                            }
+                            cdwriterNb++;
+                        }
+                        else if( ent->discType().contains("floppy"))
+                        {
+                            if( floppyNb == 1)
+                            {
+                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(floppyNb);
+                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                            }
+                            floppyNb++;
+                        }
+                        else if( ent->discType().contains("zip"))
+                        {
+                            if( zipNb == 1)
+                            {
+                                mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+                            }
+                            else
+                            {
+                                QString tmp = ent->niceDescription()+QString::number(zipNb);
+                                mountList<<i18n("%1%2 mounted at %3").arg(tmp).arg(filename).arg(ent->mountPoint());
+                            }
+                            zipNb++;
+                        }
+
+                        else
+                            mountList<<i18n("%1%2 mounted at %3").arg(ent->niceDescription()).arg(filename).arg(ent->mountPoint());
+
 			mountList<<ent->deviceName();
 //			mountList<<ent->mountPoint();
 			mountList<<"file:/"+(ent->mountPoint().startsWith("/")?ent->mountPoint().right(ent->mountPoint().length()-1):ent->mountPoint());