Second part of prior commit

pull/16/head
Timothy Pearson 10 years ago
parent d46b1b9c64
commit ff57382179

@ -754,7 +754,7 @@ void KOpenWithDlg::slotOK()
{
desktop->writeEntry("Terminal", false);
}
desktop->writeEntry("InitialPreference", maxPreference + 1);
desktop->writeEntry("X-TDE-InitialPreference", maxPreference + 1);
if (bRemember || d->saveNewApps)

@ -4077,7 +4077,7 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props
TQString commentStr = config.readComment();
TQString genNameStr = config.readGenericName();
TQStringList selectedTypes = config.readListEntry( "ServiceTypes" );
TQStringList selectedTypes = config.readListEntry( "X-TDE-ServiceTypes" );
// For compatibility with KDE 1.x
selectedTypes += config.readListEntry( "MimeType", ';' );
@ -4195,7 +4195,7 @@ void TDEApplicationPropsPlugin::applyChanges()
selectedTypes.append( extensionsList->text( i ) );
config.writeEntry( "MimeType", selectedTypes, ';' );
config.writeEntry( "ServiceTypes", "" );
config.writeEntry( "X-TDE-ServiceTypes", "" );
// hmm, actually it should probably be the contrary (but see also typeslistitem.cpp)
TQString nameStr = nameEdit ? nameEdit->text() : TQString::null;

@ -267,8 +267,8 @@ KService::init( KDesktopFile *config )
m_strInit = config->readEntry("X-TDE-Init" );
entryMap.remove("X-TDE-Init");
m_lstServiceTypes = config->readListEntry( "ServiceTypes" );
entryMap.remove("ServiceTypes");
m_lstServiceTypes = config->readListEntry( "X-TDE-ServiceTypes" );
entryMap.remove("X-TDE-ServiceTypes");
// For compatibility with KDE 1.x
if (!kde4application)
m_lstServiceTypes += config->readListEntry( "MimeType", ';' );
@ -299,8 +299,8 @@ KService::init( KDesktopFile *config )
m_initialPreference = config->readNumEntry( "X-TDE-InitialPreference", 1 );
entryMap.remove("X-TDE-InitialPreference");
if ( m_initialPreference == 1 )
m_initialPreference = config->readNumEntry( "InitialPreference", 1 );
entryMap.remove("InitialPreference");
m_initialPreference = config->readNumEntry( "X-TDE-InitialPreference", 1 );
entryMap.remove("X-TDE-InitialPreference");
// Store all additional entries in the property map.
// A TQMap<TQString,TQString> would be easier for this but we can't

Loading…
Cancel
Save