diff options
| -rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp | 2 | ||||
| -rw-r--r-- | libkonq/konq_popupmenu.cc | 6 | ||||
| -rw-r--r-- | nsplugins/pluginscan.cpp | 4 | ||||
| -rw-r--r-- | tdeioslave/media/libmediacommon/notifierserviceaction.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/media/libmediacommon/notifiersettings.cpp | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index d9930224e..eb96f682a 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -277,7 +277,7 @@ void FilterOptions::save() KSimpleConfig service(path + name + ".desktop"); service.setGroup("Desktop Entry"); service.writeEntry("Type", "Service"); - service.writeEntry("ServiceTypes", "SearchProvider"); + service.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); service.writeEntry("Name", provider->name()); service.writeEntry("Query", provider->query(), true, false, true); service.writeEntry("Keys", provider->keys()); @@ -307,7 +307,7 @@ void FilterOptions::save() KSimpleConfig service(path + *it + ".desktop"); service.setGroup("Desktop Entry"); service.writeEntry("Type", "Service"); - service.writeEntry("ServiceTypes", "SearchProvider"); + service.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); service.writeEntry("Hidden", true); } diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 436a3225e..ae86c5836 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -501,7 +501,7 @@ void KURISearchFilterEngine::loadConfig() KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop"); desktop.setGroup("Desktop Entry"); desktop.writeEntry("Type", "Service"); - desktop.writeEntry("ServiceTypes", "SearchProvider"); + desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider"); desktop.writeEntry("Name", *it); desktop.writeEntry("Query", query); desktop.writeEntry("Keys", keys); diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index b5e3be44d..c16b95abf 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -782,10 +782,10 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( capabilities.contains( "Write" ) && !sWriting ) continue; } - if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-TDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) ) + if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-TDE-GetActionMenu") ) && cfg.hasKey( "X-TDE-ServiceTypes" ) ) { - const TQStringList types = cfg.readListEntry( "ServiceTypes" ); - const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" ); + const TQStringList types = cfg.readListEntry( "X-TDE-ServiceTypes" ); + const TQStringList excludeTypes = cfg.readListEntry( "X-TDE-ExcludeServiceTypes" ); bool ok = false; // check for exact matches or a typeglob'd mimetype if we have a mimetype diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 0b6855c42..8e08178be 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -470,8 +470,8 @@ void writeServicesFile( TQStringList mimeTypes ) ts << "Icon=netscape" << endl; ts << "Comment=" << i18n("Netscape plugin viewer") << endl; ts << "X-TDE-Library=libnsplugin" << endl; - ts << "InitialPreference=7" << endl; - ts << "ServiceTypes=KParts/ReadOnlyPart,Browser/View" << endl; + ts << "X-TDE-InitialPreference=7" << endl; + ts << "X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View" << endl; ts << "X-TDE-BrowserView-PluginsInfo=nsplugins/pluginsinfo" << endl; if (mimeTypes.count() > 0) 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<NotifierServiceAction*> NotifierSettings::loadActions( KDesktopFile TQValueList<NotifierServiceAction*> services; const TQString filename = desktop.fileName(); - const TQStringList mimetypes = desktop.readListEntry( "ServiceTypes" ); + const TQStringList mimetypes = desktop.readListEntry( "X-TDE-ServiceTypes" ); TQValueList<KDEDesktopMimeType::Service> 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() ) { |