From 910b602ca120402a9e6fccd1301ebb4346597024 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 11 Oct 2014 17:26:54 -0500 Subject: Second part of prior commit --- tdeioslave/media/libmediacommon/notifierserviceaction.cpp | 2 +- tdeioslave/media/libmediacommon/notifiersettings.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tdeioslave') diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp index 2405dfb39..c0b11043c 100644 --- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp @@ -159,7 +159,7 @@ void NotifierServiceAction::save() const desktopFile.setDesktopGroup(); - desktopFile.writeEntry(TQString("ServiceTypes"), m_mimetypes, ","); + desktopFile.writeEntry(TQString("X-TDE-ServiceTypes"), m_mimetypes, ","); desktopFile.writeEntry(TQString("Actions"), TQStringList(m_service.m_strName),";"); } diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index a7dc7ee21..53d5e63ab 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.cpp +++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp @@ -297,7 +297,7 @@ TQValueList NotifierSettings::loadActions( KDesktopFile TQValueList services; const TQString filename = desktop.fileName(); - const TQStringList mimetypes = desktop.readListEntry( "ServiceTypes" ); + const TQStringList mimetypes = desktop.readListEntry( "X-TDE-ServiceTypes" ); TQValueList type_services = KDEDesktopMimeType::userDefinedServices(filename, true); @@ -325,7 +325,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString desktop.setDesktopGroup(); if ( desktop.hasKey( "Actions" ) - && desktop.hasKey( "ServiceTypes" ) + && desktop.hasKey( "X-TDE-ServiceTypes" ) && !desktop.readBoolEntry( "X-TDE-MediaNotifierHide", false ) ) { const TQStringList actions = desktop.readListEntry( "Actions" ); @@ -335,7 +335,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString return false; } - const TQStringList types = desktop.readListEntry( "ServiceTypes" ); + const TQStringList types = desktop.readListEntry( "X-TDE-ServiceTypes" ); if ( mimetype.isEmpty() ) { -- cgit v1.2.3