diff options
author | Darrell Anderson <[email protected]> | 2012-06-08 15:56:39 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-06-08 15:56:39 -0500 |
commit | 829790146716bc30c2e98cf2a767e60f60e5143a (patch) | |
tree | 9ec044f1ff90653dc07bc9e50254ab56c61b7144 /kontact/src | |
parent | 66914d2878a6cadacbaf6ceacdd74d2999e4114e (diff) | |
download | tdepim-829790146716bc30c2e98cf2a767e60f60e5143a.tar.gz tdepim-829790146716bc30c2e98cf2a767e60f60e5143a.zip |
Update XDG information in support of bug report 892.
Diffstat (limited to 'kontact/src')
-rw-r--r-- | kontact/src/Kontact.desktop | 4 | ||||
-rw-r--r-- | kontact/src/kcmkontact.cpp | 8 | ||||
-rw-r--r-- | kontact/src/kontactconfig.desktop | 14 | ||||
-rw-r--r-- | kontact/src/kontactdcop.desktop | 4 | ||||
-rw-r--r-- | kontact/src/main.cpp | 4 | ||||
-rw-r--r-- | kontact/src/mainwindow.cpp | 12 |
6 files changed, 23 insertions, 23 deletions
diff --git a/kontact/src/Kontact.desktop b/kontact/src/Kontact.desktop index a4127aac0..82ec08bb5 100644 --- a/kontact/src/Kontact.desktop +++ b/kontact/src/Kontact.desktop @@ -64,6 +64,6 @@ GenericName[uz]=Шахсий маълумот бошқарувчиси GenericName[zh_CN]=个人信息管理器 GenericName[zh_TW]=個人資訊管理者 Terminal=false -X-KDE-StartupNotify=true -Categories=Qt;KDE;Office;Network;Email; +X-TDE-StartupNotify=true +Categories=Qt;TDE;Office;Network;Email; DocPath=kontact/index.html diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp index cd9478f0a..2f5849bf9 100644 --- a/kontact/src/kcmkontact.cpp +++ b/kontact/src/kcmkontact.cpp @@ -115,20 +115,20 @@ void PluginSelection::readConfig() { const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); int activeComponent = 0; mPluginCombo->clear(); for ( KService::List::ConstIterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = *it; // skip summary only plugins - TQVariant var = service->property( "X-KDE-KontactPluginHasPart" ); + TQVariant var = service->property( "X-TDE-KontactPluginHasPart" ); if ( var.isValid() && var.toBool() == false ) continue; mPluginCombo->insertItem( service->name() ); mPluginList.append( service ); - if ( service->property("X-KDE-PluginInfo-Name").toString() == mItem->value() ) + if ( service->property("X-TDE-PluginInfo-Name").toString() == mItem->value() ) activeComponent = mPluginList.count() - 1; } @@ -138,7 +138,7 @@ void PluginSelection::readConfig() void PluginSelection::writeConfig() { KService::Ptr ptr = *( mPluginList.at( mPluginCombo->currentItem() ) ); - mItem->setValue( ptr->property("X-KDE-PluginInfo-Name").toString() ); + mItem->setValue( ptr->property("X-TDE-PluginInfo-Name").toString() ); } TQValueList<TQWidget *> PluginSelection::widgets() const diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop index ec184ea5b..6ea38e238 100644 --- a/kontact/src/kontactconfig.desktop +++ b/kontact/src/kontactconfig.desktop @@ -4,13 +4,13 @@ Icon=kontact Type=Service ServiceTypes=KCModule -X-KDE-ModuleType=Library -X-KDE-Library=kontact -X-KDE-FactoryName=kontactconfig -X-KDE-HasReadOnlyMode=false -X-KDE-ParentApp=kontact -X-KDE-ParentComponents=kontact -X-KDE-Weight=0 +X-TDE-ModuleType=Library +X-TDE-Library=kontact +X-TDE-FactoryName=kontactconfig +X-TDE-HasReadOnlyMode=false +X-TDE-ParentApp=kontact +X-TDE-ParentComponents=kontact +X-TDE-Weight=0 Name=Kontact Name[be]=Кантакт diff --git a/kontact/src/kontactdcop.desktop b/kontact/src/kontactdcop.desktop index fdd07b9cc..805eeeadf 100644 --- a/kontact/src/kontactdcop.desktop +++ b/kontact/src/kontactdcop.desktop @@ -14,5 +14,5 @@ NoDisplay=true X-DCOP-ServiceType=Unique X-DCOP-ServiceName=kontact ServiceTypes=DCOP/ResourceBackend/IMAP,DCOP/Mailer -X-KDE-StartupNotify=false -Categories=Qt;KDE;Office +X-TDE-StartupNotify=false +Categories=Qt;TDE;Office diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp index 67fe055f5..99fff1538 100644 --- a/kontact/src/main.cpp +++ b/kontact/src/main.cpp @@ -77,11 +77,11 @@ static void listPlugins() KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) { KService::Ptr service = (*it); // skip summary only plugins - TQVariant var = service->property( "X-KDE-KontactPluginHasPart" ); + TQVariant var = service->property( "X-TDE-KontactPluginHasPart" ); if ( var.isValid() && var.toBool() == false ) continue; cout << service->library().remove( "libkontact_" ).latin1() << endl; diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index fb39e64fd..41e026a69 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -125,7 +125,7 @@ void MainWindow::initGUI() KTrader::OfferList offers = KTrader::self()->query( TQString::fromLatin1( "Kontact/Plugin" ), - TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); + TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) ); mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" ); KPluginInfo::List::Iterator it; @@ -138,7 +138,7 @@ void MainWindow::initGUI() action->setName( (*it)->pluginName().latin1() ); action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) ); - TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); + TQVariant hasPartProp = (*it)->property( "X-TDE-KontactPluginHasPart" ); if ( !hasPartProp.isValid() || hasPartProp.toBool() ) { mActionPlugins.append( action ); } @@ -552,10 +552,10 @@ void MainWindow::loadPlugins() plugin->setTitle( (*it)->name() ); plugin->setIcon( (*it)->icon() ); - TQVariant libNameProp = (*it)->property( "X-KDE-KontactPartLibraryName" ); - TQVariant exeNameProp = (*it)->property( "X-KDE-KontactPartExecutableName" ); - TQVariant loadOnStart = (*it)->property( "X-KDE-KontactPartLoadOnStart" ); - TQVariant hasPartProp = (*it)->property( "X-KDE-KontactPluginHasPart" ); + TQVariant libNameProp = (*it)->property( "X-TDE-KontactPartLibraryName" ); + TQVariant exeNameProp = (*it)->property( "X-TDE-KontactPartExecutableName" ); + TQVariant loadOnStart = (*it)->property( "X-TDE-KontactPartLoadOnStart" ); + TQVariant hasPartProp = (*it)->property( "X-TDE-KontactPluginHasPart" ); if ( !loadOnStart.isNull() && loadOnStart.toBool() ) mDelayedPreload.append( plugin ); |