Merge remote-tracking branch 'origin/KDE/4.11'

[dolphin.git] / src / panels / places / placesitem.cpp

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index dac1bdb3b6887365bca9279f0ff2c3a234321329..76b51e3aa62b8da39f41a01332a7b57aa1fb7116 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -37,6 +37,7 @@ PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :
     m_access(),
     m_volume(),
     m_disc(),
+    m_mtp(),
     m_signalHandler(0),
     m_trashDirLister(0),
     m_bookmark()
@@ -124,6 +125,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     delete m_access;
     delete m_volume;
     delete m_disc;
+    delete m_mtp;
 
 
     const QString udi = bookmark.metaDataItem("UDI");
@@ -138,7 +140,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
     const GroupType type = groupType();
     if (icon().isEmpty()) {
         switch (type) {
-        case RecentlyAccessedType: setIcon("package_utility_time"); break;
+        case RecentlyAccessedType: setIcon("chronometer"); break;
         case SearchForType:        setIcon("nepomuk"); break;
         case PlacesType:
         default:                   setIcon("folder");
@@ -174,6 +176,10 @@ PlacesItem::GroupType PlacesItem::groupType() const
             return SearchForType;
         }
 
+        if (protocol == QLatin1String("bluetooth")) {
+            return DevicesType;
+        }
+
         return PlacesType;
     }
 
@@ -252,6 +258,7 @@ void PlacesItem::initializeDevice(const QString& udi)
     m_access = m_device.as<Solid::StorageAccess>();
     m_volume = m_device.as<Solid::StorageVolume>();
     m_disc = m_device.as<Solid::OpticalDisc>();
+    m_mtp = m_device.as<Solid::PortableMediaPlayer>();
 
     setText(m_device.description());
     setIcon(m_device.icon());
@@ -263,8 +270,15 @@ void PlacesItem::initializeDevice(const QString& udi)
         QObject::connect(m_access, SIGNAL(accessibilityChanged(bool,QString)),
                          m_signalHandler, SLOT(onAccessibilityChanged()));
     } else if (m_disc && (m_disc->availableContent() & Solid::OpticalDisc::Audio) != 0) {
-        const QString device = m_device.as<Solid::Block>()->device();
-        setUrl(QString("audiocd:/?device=%1").arg(device));
+        Solid::Block *block = m_device.as<Solid::Block>();
+        if (block) {
+            const QString device = block->device();
+            setUrl(QString("audiocd:/?device=%1").arg(device));
+        } else {
+            setUrl(QString("audiocd:/"));
+        }
+    } else if (m_mtp) {
+        setUrl(QString("mtp:udi=%1").arg(m_device.udi()));
     }
 }