Second part of prior commit

pull/2/head
Timothy Pearson 10 years ago
parent ee9dade9cf
commit 910b602ca1

@ -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);
}

@ -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);

@ -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

@ -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)

@ -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),";");
}

@ -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() )
{

Loading…
Cancel
Save