From f97e24f3c3c4879426255f3170d7f703ddbc268d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 28 Jun 2019 15:56:37 +0900 Subject: Fixed media type for cd rw type. Signed-off-by: Michele Calgaro --- tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 2 +- tdeioslave/media/services/media_decrypt.desktop | 2 +- tdeioslave/media/services/media_mount.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index f32268855..65b53a0f4 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -154,11 +154,11 @@ MountHelper::MountHelper() : TDEApplication() * anyway. Only if both unmount and eject fail, notify the user by * displaying the saved error message (see ejectFinished()). */ + TQStringVariantMap unmountResult; if (medium.isMounted()) { DCOPReply reply = mediamanager.call( "unmount", medium.id()); if (reply.isValid()) { - TQStringVariantMap unmountResult; reply.get(unmountResult); if (unmountResult["result"].toBool()) { reply.get(m_errorStr); diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop index e4a552e29..54580e86c 100644 --- a/tdeioslave/media/services/media_decrypt.desktop +++ b/tdeioslave/media/services/media_decrypt.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -X-TDE-ServiceTypes=media/removable_encrypted_locked,media/hdd_encrypted_locked,media/cdrom_encrypted_locked,media/cdwriter_encrypted_locked,media/dvd_encrypted_locked +X-TDE-ServiceTypes=media/removable_encrypted_locked,media/hdd_encrypted_locked,media/cdrom_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked Actions=MediaUnlock; X-TDE-Priority=TopLevel X-TDE-MediaNotifierHide=true diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop index aa9afe960..cbd663777 100644 --- a/tdeioslave/media/services/media_mount.desktop +++ b/tdeioslave/media/services/media_mount.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cdwriter_unmounted,media/cdwriter_encrypted_unlocked,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/nfs_unmounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted +X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/nfs_unmounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted Actions=MediaMount; X-TDE-Priority=TopLevel X-TDE-MediaNotifierHide=true -- cgit v1.2.3