File revert_solid_workaround.diff of Package amarok
diff --git a/src/MediaDeviceCache.cpp b/src/MediaDeviceCache.cpp
index 15583b8..8682f4d 100644
--- a/src/MediaDeviceCache.cpp
+++ b/src/MediaDeviceCache.cpp
@@ -100,11 +100,9 @@ MediaDeviceCache::refreshCache()
{
m_type[device.udi()] = MediaDeviceCache::SolidVolumeType;
m_name[device.udi()] = ssa->filePath();
- m_accessibility[ device.udi() ] = true;
}
else
{
- m_accessibility[ device.udi() ] = false;
debug() << "Solid device is not accessible, will wait until it is to consider it added.";
}
}
diff --git a/src/MediaDeviceCache.h b/src/MediaDeviceCache.h
index a48d453..0e971cc 100644
--- a/src/MediaDeviceCache.h
+++ b/src/MediaDeviceCache.h
@@ -23,7 +23,6 @@
#include <QMap>
#include <QString>
#include <QStringList>
-#include <QtCore/QTimer>
namespace Solid {
class Device;
@@ -67,7 +66,6 @@ class AMAROK_EXPORT MediaDeviceCache : p
private:
QMap<QString, MediaDeviceCache::DeviceType> m_type;
QMap<QString, QString> m_name;
- QMap<QString, bool> m_accessibility;
QStringList m_volumes;
static MediaDeviceCache* s_instance;
};