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

List:       kde-commits
Subject:    [amarok] src/core-impl/collections/umscollection: Revert "Do not create duplicate UMS collections fo
From:       Frank_Meerkötter <frank () meerkoetter ! org>
Date:       2013-10-06 12:06:16
Message-ID: E1VSn6G-00018j-NB () scm ! kde ! org
[Download RAW message or body]

Git commit 6caef1b257b70485fc7f4850826a51f818925720 by Frank Meerkötter.
Committed on 06/10/2013 at 12:01.
Pushed by fmeerkoetter into branch 'master'.

Revert "Do not create duplicate UMS collections for encrypted volumes."

This reverts commit 9d12f655f1ac1f518aa67f2bba1dfcad05b673fa.

This patch wasn't ready for prime time. Some encrypted USB mass
storage is no longer recognized by amarok. Reverting it for now.

M  +0    -25   src/core-impl/collections/umscollection/UmsCollection.cpp
M  +0    -5    src/core-impl/collections/umscollection/UmsCollection.h

http://commits.kde.org/amarok/6caef1b257b70485fc7f4850826a51f818925720

diff --git a/src/core-impl/collections/umscollection/UmsCollection.cpp \
b/src/core-impl/collections/umscollection/UmsCollection.cpp index a73fd34..70e57b8 \
                100644
--- a/src/core-impl/collections/umscollection/UmsCollection.cpp
+++ b/src/core-impl/collections/umscollection/UmsCollection.cpp
@@ -131,28 +131,6 @@ UmsCollectionFactory::slotCollectionDestroyed( QObject \
*collection )  }
 
 bool
-UmsCollectionFactory::isNonFilesystemVolume( const Solid::Device &device ) const
-{
-    using namespace Solid;
-    const StorageVolume *sv = device.as<StorageVolume>();
-    if( !sv )
-        return false;
-
-    switch( sv->usage() )
-    {
-        case StorageVolume::Other:
-        case StorageVolume::Unused:
-        case StorageVolume::PartitionTable:
-        case StorageVolume::Encrypted:
-        case StorageVolume::Raid:
-            return true;
-        case StorageVolume::FileSystem:
-            return false;
-    }
-    return false;
-}
-
-bool
 UmsCollectionFactory::identifySolidDevice( const QString &udi ) const
 {
     Solid::Device device( udi );
@@ -171,9 +149,6 @@ UmsCollectionFactory::identifySolidDevice( const QString &udi ) \
const  return false;
     }
 
-    if( isNonFilesystemVolume( device ) )
-        return false;
-
     // check whether there is parent USB StorageDrive device
     while( device.isValid() )
     {
diff --git a/src/core-impl/collections/umscollection/UmsCollection.h \
b/src/core-impl/collections/umscollection/UmsCollection.h index ac49f82..0bc620c \
                100644
--- a/src/core-impl/collections/umscollection/UmsCollection.h
+++ b/src/core-impl/collections/umscollection/UmsCollection.h
@@ -85,11 +85,6 @@ class UmsCollectionFactory : public CollectionFactory
         bool identifySolidDevice( const QString &udi ) const;
 
         /**
-         * Returns true if this is a volume that isn't containing a filesystem.
-         */
-        bool isNonFilesystemVolume( const Solid::Device &device ) const;
-
-        /**
          * Attempts to create appropriate collection for already identified solid \
                device
          * @param udi. Should emit newCollection() if the collection was \
                successfully
          * created and should become visible to the user.


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