--- kdebase-3.5.4/kioslave/media/mediamanager/halbackend.cpp.me	2009-02-04 18:59:57.000000000 +0100
+++ kdebase-3.5.4/kioslave/media/mediamanager/halbackend.cpp	2009-02-04 19:00:13.000000000 +0100
@@ -261,7 +261,9 @@
     }
 
     /* Floppy & zip drives */
-    if (libhal_device_query_capability(m_halContext, udi, "storage", NULL))
+    if (libhal_device_query_capability(m_halContext, udi, "storage", NULL) && \
+        libhal_device_get_property_QString(m_halContext, udi, "storage.bus") != "usb")
+    {
         if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") ||
             (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") ||
             (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz"))
@@ -276,8 +278,9 @@
                 m_mediaList.addMedium(medium, allowNotification);
             else
                 delete medium;
-            return;
         }
+        return;
+    }
 
     /* Camera handled by gphoto2*/
     if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) &&
@@ -399,7 +402,7 @@
             Medium m( *cmedium );
             if ( setFstabProperties( &m ) ) {
                 kdDebug() << "setFstabProperties worked" << endl;
-                m_mediaList.changeMediumState(m, false);
+                m_mediaList.changeMediumState(m, allowNotification);
             }
             return;
         }
@@ -637,8 +640,8 @@
         }
     }
 
-    medium->setName(
-        generateName(libhal_drive_get_device_file(halDrive)) );
+    medium->setName( generateName(libhal_drive_get_device_file(halDrive)) );
+    medium->setLabel(i18n("Unknown Drive"));
 
     // HAL hates floppies - so we have to do it twice ;(
     medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false);
@@ -650,6 +653,7 @@
             medium->setMimeType("media/floppy_mounted" );
         else
             medium->setMimeType("media/floppy_unmounted");
+        medium->setLabel(i18n("Floppy Drive"));
     }
 
     else if (drive_type == "zip") 
@@ -658,6 +662,7 @@
             medium->setMimeType("media/zip_mounted" );
         else
             medium->setMimeType("media/zip_unmounted");
+        medium->setLabel(i18n("Zip Drive"));
     }
 
     /** @todo And mimtype for JAZ drives ? */