[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kioslave/media
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-06-21 8:56:20
Message-ID: 1150880180.929024.500.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 553501 by coolo:

better support for baseurl medias as discussed with Kevin


 M  +4 -8      libmediacommon/medium.cpp  
 M  +7 -3      mediamanager/halbackend.cpp  


--- branches/KDE/3.5/kdebase/kioslave/media/libmediacommon/medium.cpp #553500:553501
@@ -163,7 +163,7 @@
 bool Medium::mountableState(bool mounted)
 {
 	if ( m_properties[DEVICE_NODE].isEmpty()
-	  || m_properties[MOUNT_POINT].isEmpty() )
+	  || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) )
 	{
 		return false;
 	}
@@ -208,14 +208,10 @@
 
 KURL Medium::prettyBaseURL() const
 {
-	if ( isMountable() )
-	{
+        if ( !baseURL().isEmpty() )
+            return baseURL();
+
 		return KURL( mountPoint() );
-	}
-	else
-	{
-		return KURL( baseURL() );
-	}
 }
 
 QString Medium::prettyLabel() const
--- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp \
#553500:553501 @@ -487,7 +487,6 @@
     else
     {
         mimeType = "media/hdd" + MOUNT_SUFFIX;
-        const char *physdev = libhal_drive_get_physical_device_udi(halDrive);
         if (libhal_drive_is_hotpluggable(halDrive))
         {
             mimeType = "media/removable" + MOUNT_SUFFIX;
@@ -506,11 +505,15 @@
                 medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX);
                 break;
             case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
+            {
                 medium->setIconName("ipod" + MOUNT_ICON_SUFFIX);
                 break;
+            }
             case LIBHAL_DRIVE_TYPE_CAMERA:
+            {
                 mimeType = "media/camera" + MOUNT_SUFFIX;
                 medium->setIconName("camera" + MOUNT_ICON_SUFFIX);
+                const char *physdev = \
libhal_drive_get_physical_device_udi(halDrive);  // get model from camera
                 if (physdev && libhal_device_query_capability(m_halContext, physdev, \
"camera", NULL))  {
@@ -520,19 +523,20 @@
                         \
medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, \
"usb.product"));  }
                 break;
+            }
             case LIBHAL_DRIVE_TYPE_TAPE:
                 medium->setIconName(QString::null); //FIXME need icon
                 break;
             default:
                 medium->setIconName(QString::null);
-            };
+            }
 
             if (medium->isMounted() && QFile::exists(medium->mountPoint() + \
"/dcim"))  {
                 mimeType = "media/camera" + MOUNT_SUFFIX;
                 medium->setIconName("camera" + MOUNT_ICON_SUFFIX);
             }
-        };
+        }
     }
     medium->setMimeType(mimeType);
 


[prev in list] [next in list] [prev in thread] [next in thread]