Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > media > main-src > by-pkgid > a6bc312ce50b5c8d0c51736e58ac32bc > files > 365

kdebase-3.4.2-55mdk.src.rpm

--- kdebase-3.4.2/kioslave/media/kdedmodule/mediamanager.h--	2005-09-19 22:15:07.000000000 +0200
+++ kdebase-3.4.2/kioslave/media/kdedmodule/mediamanager.h	2005-09-19 22:16:13.000000000 +0200
@@ -38,6 +38,7 @@ public:
 
 k_dcop:
 	QStringList fullList();
+	QStringList windowsList();
 	QStringList properties(const QString &name);
 	QString nameForLabel(const QString &label);
 	ASYNC setUserLabel(const QString &name, const QString &label);
--- kdebase-3.4.2/kioslave/media/kdedmodule/mediamanager.cpp.backlist	2005-09-19 23:38:23.000000000 +0200
+++ kdebase-3.4.2/kioslave/media/kdedmodule/mediamanager.cpp	2005-09-20 13:42:36.000000000 +0200
@@ -100,6 +100,35 @@ QStringList MediaManager::fullList()
 	return result;
 }
 
+QStringList MediaManager::windowsList()
+{
+        QPtrList<Medium> list = m_mediaList.list();
+
+        QStringList result;
+
+        QPtrList<Medium>::const_iterator it = list.begin();
+        QPtrList<Medium>::const_iterator end = list.end();
+        for (; it!=end; ++it)
+        {
+				if ( ( *it )->mimeType().startsWith( "media/hdd" ) )
+				{
+                	QString typePart = (*it)->fsType();
+                	if( typePart == "vfat" || typePart == "msdos" || typePart == "fat" || typePart=="ntfs" )
+                	{
+                    	    result+= (*it)->properties();
+                        	result+= Medium::SEPARATOR;
+                	}
+				}
+				else
+				{
+                            result+= (*it)->properties();
+                            result+= Medium::SEPARATOR;						
+				}
+        }
+
+        return result;
+}
+
 QStringList MediaManager::properties(const QString &name)
 {
 	const Medium *m = m_mediaList.findByName(name);