diff -U3 -r amarok-1.4.4.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp amarok-1.4.4/amarok/src/mediadevice/mtp/mtpmediadevice.cpp --- amarok-1.4.4.orig/amarok/src/mediadevice/mtp/mtpmediadevice.cpp 2006-10-26 23:40:20.000000000 +0300 +++ amarok-1.4.4/amarok/src/mediadevice/mtp/mtpmediadevice.cpp 2007-01-03 00:47:51.000000000 +0200 @@ -977,6 +977,7 @@ if( !isConnected() ) return false; +#if 0 uint64_t totalbytes; uint64_t freebytes; char *storage_description; @@ -996,6 +997,11 @@ debug() << "couldn't get storage details" << endl; return false; } +#else + *total = m_device->storage->MaxCapacity; + *available = m_device->storage->FreeSpaceInBytes; + return true; +#endif } /** @@ -1014,15 +1020,19 @@ uint8_t maxbattlevel; uint8_t currbattlevel; +#if 0 uint64_t totalbytes; uint64_t freebytes; char *storage_description; char *volume_label; +#endif char *sectime; m_critical_mutex.lock(); +#if 0 LIBMTP_Get_Storageinfo( m_device, &totalbytes, &freebytes, &storage_description, &volume_label ); +#endif LIBMTP_Get_Batterylevel( m_device, &maxbattlevel, &currbattlevel ); LIBMTP_Get_Secure_Time( m_device, §ime ); m_critical_mutex.unlock(); @@ -1032,8 +1042,13 @@ + '%'; secureTime = i18n("Secure time: ") + sectime; storageInformation = i18n("Volume label: ") +#if 0 + volume_label + '\n' + i18n("Storage description: ") + storage_description; +#else + + m_device->storage->VolumeIdentifier + '\n' + + i18n("Storage description: ") + m_device->storage->StorageDescription; +#endif supportedFiles = i18n("Supported file types: ") + m_supportedFiles.join( ", " ); @@ -1041,8 +1056,10 @@ + m_name + '\n' + batteryLevel + '\n' + secureTime + '\n' + storageInformation + '\n' + supportedFiles ); +#if 0 free(storage_description); free(volume_label); +#endif free(sectime); } else