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

List:       kde-commits
Subject:    [kde-baseapps/KDE/4.9] dolphin/src/panels/places: Removed customm setText for mtp devices and check
From:       Alex Fiestas <afiestas () kde ! org>
Date:       2012-10-31 23:28:25
Message-ID: 20121031232825.14E4BA6078 () git ! kde ! org
[Download RAW message or body]

Git commit a7f23dd5dde76bf05e91938e5828b29aa5d0a9e0 by Alex Fiestas.
Committed on 01/11/2012 at 00:25.
Pushed by afiestas into branch 'KDE/4.9'.

Removed customm setText for mtp devices and check for kio_mtp

We are already checking if kio_mtp is installed when we build the
predicate so we don't need to check if it is installed again.

Also, the fix for "Showing the product as a name for some kind of
massive storage" will have to be delayed to 4.9.4, so removing this.

M  +1    -2    dolphin/src/panels/places/placesitem.cpp

http://commits.kde.org/kde-baseapps/a7f23dd5dde76bf05e91938e5828b29aa5d0a9e0

diff --git a/dolphin/src/panels/places/placesitem.cpp b/dolphin/src/panels/places/placesitem.cpp
index f78c98b..75e14d0 100644
--- a/dolphin/src/panels/places/placesitem.cpp
+++ b/dolphin/src/panels/places/placesitem.cpp
@@ -268,8 +268,7 @@ void PlacesItem::initializeDevice(const QString& udi)
     } 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));
-    } else if (m_mtp && m_mtp->supportedProtocols().contains("mtp")) {
-        setText(m_device.product());
+    } else if (m_mtp) {
         setUrl(QString("mtp:udi=%1").arg(m_device.udi()));
     }
 }
[prev in list] [next in list] [prev in thread] [next in thread]