SVN commit 933459 by kossebau: changed: default icon is now given by the mimetype M +4 -4 networkslave.cpp --- trunk/playground/network/networkkio/ioslave/networkslave.cpp #933458:933459 @@ -46,7 +46,7 @@ }; static const char NetworkMimetype[] = "inode/vnd.kde.network"; -static const char NetworkIconName[] = "network-workgroup"; +// static const char NetworkIconName[] = "network-workgroup"; NetworkSlave::NetworkSlave( const QByteArray& name, const QByteArray& poolSocket, const QByteArray& programSocket ) @@ -317,7 +317,7 @@ void NetworkSlave::feedEntryAsNetwork( KIO::UDSEntry* entry ) { entry->insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR ); - entry->insert( KIO::UDSEntry::UDS_ICON_NAME, NetworkIconName ); +// entry->insert( KIO::UDSEntry::UDS_ICON_NAME, NetworkIconName ); entry->insert( KIO::UDSEntry::UDS_MIME_TYPE, NetworkMimetype ); } @@ -327,7 +327,7 @@ entry->insert( KIO::UDSEntry::UDS_NAME, device.hostName() ); entry->insert( KIO::UDSEntry::UDS_DISPLAY_NAME, device.name() ); entry->insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR ); - entry->insert( KIO::UDSEntry::UDS_ICON_NAME, NetDevice::iconName(device.type()) ); +// entry->insert( KIO::UDSEntry::UDS_ICON_NAME, NetDevice::iconName(device.type()) ); entry->insert( KIO::UDSEntry::UDS_MIME_TYPE, DeviceMimetype[device.type()] ); } @@ -337,7 +337,7 @@ entry->insert( KIO::UDSEntry::UDS_NAME, service.name()+'.'+service.type() ); entry->insert( KIO::UDSEntry::UDS_DISPLAY_NAME, service.name() ); entry->insert( KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR ); - entry->insert( KIO::UDSEntry::UDS_ICON_NAME, service.iconName() ); +// entry->insert( KIO::UDSEntry::UDS_ICON_NAME, service.iconName() ); entry->insert( KIO::UDSEntry::UDS_MIME_TYPE, service.mimetype() ); if( !service.url().isEmpty() ) entry->insert( KIO::UDSEntry::UDS_TARGET_URL, service.url() );