diff options
Diffstat (limited to 'kioslave')
| -rw-r--r-- | kioslave/media/mediaimpl.cpp | 7 | ||||
| -rw-r--r-- | kioslave/media/mediamanager/halbackend.cpp | 8 | ||||
| -rw-r--r-- | kioslave/smb/kio_smb_auth.cpp | 1 | ||||
| -rw-r--r-- | kioslave/system/entries/documents.desktop | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp index fb9e01480..b55b37e5d 100644 --- a/kioslave/media/mediaimpl.cpp +++ b/kioslave/media/mediaimpl.cpp @@ -281,6 +281,13 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) return m_lastErrorCode==0; } + if (medium.id().isEmpty()) + { + m_lastErrorCode = KIO::ERR_COULD_NOT_MOUNT; + m_lastErrorMessage = i18n("No such medium."); + return false; + } + return true; } diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index b6763ee84..7b56d46ad 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -35,6 +35,7 @@ #include <kmountpoint.h> #include <kmessagebox.h> #include <kio/job.h> +#include <kprotocolinfo.h> #include <kstandarddirs.h> #include <kprocess.h> @@ -623,6 +624,13 @@ void HALBackend::setVolumeProperties(Medium* medium) case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: { medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); + + if (libhal_device_get_property_QString(m_halContext, driveUdi.latin1(), "info.product") == "iPod" && + KProtocolInfo::isKnownProtocol( TQString("ipod") ) ) + { + medium->unmountableState( "ipod:/" ); + medium->mountableState( libhal_volume_is_mounted(halVolume) ); + } break; } case LIBHAL_DRIVE_TYPE_CAMERA: diff --git a/kioslave/smb/kio_smb_auth.cpp b/kioslave/smb/kio_smb_auth.cpp index d216e1e5b..d4a48239f 100644 --- a/kioslave/smb/kio_smb_auth.cpp +++ b/kioslave/smb/kio_smb_auth.cpp @@ -144,6 +144,7 @@ bool SMBSlave::checkPassword(SMBUrl &url) if ( openPassDlg(info) ) { kdDebug(KIO_SMB) << "openPassDlg returned " << info.username << endl; url.setUser(info.username); + url.setPass(info.password); return true; } kdDebug(KIO_SMB) << "no value from openPassDlg\n"; diff --git a/kioslave/system/entries/documents.desktop b/kioslave/system/entries/documents.desktop index 16016e0c5..a2c0fe528 100644 --- a/kioslave/system/entries/documents.desktop +++ b/kioslave/system/entries/documents.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Link Path[$e]=$( kio_system_documenthelper ) -Icon=folder_important +Icon=folder_man Name=Documents Folder Name[af]=Dokument Gids Name[ar]=مستنداتي |