From 5f032cbe930c87fae63f0f96be7cc7a82b16025e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 01:27:30 -0500 Subject: [PATCH] Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown --- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp | 4 ++-- filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp | 4 ++-- kopete/kopete/contactlist/kopetemetacontactlvi.cpp | 2 +- kopete/plugins/statistics/statisticsplugin.cpp | 2 +- kopete/plugins/texteffect/kopete_texteffect.desktop | 2 +- kopete/plugins/texteffect/kopete_texteffect_config.desktop | 2 +- kopete/plugins/webpresence/kopete_webpresence.desktop | 2 +- kopete/plugins/webpresence/kopete_webpresence_config.desktop | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index 7f4f7cfa..3f48839c 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -314,7 +314,7 @@ void KcmSambaConf::initAdvancedTab() icon = SmallIcon("tdmconfig"); else if (label == i18n("Protocol")) - icon = SmallIcon("core"); + icon = SmallIcon("application-x-core"); else if (label == i18n("Charset")) icon = SmallIcon("charset"); @@ -329,7 +329,7 @@ void KcmSambaConf::initAdvancedTab() icon = SmallIcon("konqueror"); else if (label == i18n("Misc")) - icon = SmallIcon("misc"); + icon = SmallIcon("application-vnd.tde.misc"); else if (label == i18n("Commands")) icon = SmallIcon("konsole"); diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 958feb56..7ef146cc 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -304,7 +304,7 @@ void ShareDlgImpl::initAdvancedTab() icon = SmallIcon("tdmconfig"); else if (label.lower() == "protocol") - icon = SmallIcon("core"); + icon = SmallIcon("application-x-core"); else if (label.lower() == "coding") icon = SmallIcon("charset"); @@ -319,7 +319,7 @@ void ShareDlgImpl::initAdvancedTab() icon = SmallIcon("konqueror"); else if (label.lower() == "misc") - icon = SmallIcon("misc"); + icon = SmallIcon("application-vnd.tde.misc"); else { icon = TQPixmap(16,16); icon.fill(); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index c77367fb..bbed99fb 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -515,7 +515,7 @@ void KopeteMetaContactLVI::slotPhotoChanged() { m_oldStatusIcon= d->metaContactIcon->pixmap(); TQPixmap photoPixmap; - //TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) ); + //TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( ""x-office-address-book", TDEIcon::Desktop ) ); TQImage photoImg = m_metaContact->photo(); if ( !photoImg.isNull() && (photoImg.width() > 0) && (photoImg.height() > 0) ) { diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index 2cfe0290..c5eb2b5c 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -53,7 +53,7 @@ StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQ { TDEAction *viewMetaContactStatistics = new TDEAction( i18n("View &Statistics" ), - TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), + TQString::fromLatin1( "text-x-log" ), 0, this, TQT_SLOT(slotViewStatistics()), actionCollection(), "viewMetaContactStatistics" ); viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1); diff --git a/kopete/plugins/texteffect/kopete_texteffect.desktop b/kopete/plugins/texteffect/kopete_texteffect.desktop index 331bfc15..d62eb281 100644 --- a/kopete/plugins/texteffect/kopete_texteffect.desktop +++ b/kopete/plugins/texteffect/kopete_texteffect.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service X-Kopete-Version=1000900 -Icon=texteffect +Icon=text-x-texteffect X-TDE-ServiceTypes=Kopete/Plugin X-TDE-Library=kopete_texteffect X-TDE-PluginInfo-Author=Olivier Goffart diff --git a/kopete/plugins/texteffect/kopete_texteffect_config.desktop b/kopete/plugins/texteffect/kopete_texteffect_config.desktop index 5eb0a75b..e1914cbd 100644 --- a/kopete/plugins/texteffect/kopete_texteffect_config.desktop +++ b/kopete/plugins/texteffect/kopete_texteffect_config.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=texteffect +Icon=text-x-texteffect Type=Service X-TDE-ServiceTypes=TDECModule diff --git a/kopete/plugins/webpresence/kopete_webpresence.desktop b/kopete/plugins/webpresence/kopete_webpresence.desktop index 49095d38..d5a0928b 100644 --- a/kopete/plugins/webpresence/kopete_webpresence.desktop +++ b/kopete/plugins/webpresence/kopete_webpresence.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service X-Kopete-Version=1000900 -Icon=html +Icon=text-x-text-html X-TDE-ServiceTypes=Kopete/Plugin X-TDE-Library=kopete_webpresence X-TDE-PluginInfo-Author=Will Stephenson diff --git a/kopete/plugins/webpresence/kopete_webpresence_config.desktop b/kopete/plugins/webpresence/kopete_webpresence_config.desktop index f3a696ea..f78878ef 100644 --- a/kopete/plugins/webpresence/kopete_webpresence_config.desktop +++ b/kopete/plugins/webpresence/kopete_webpresence_config.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Icon=html +Icon=text-x-text-html X-TDE-ServiceTypes=TDECModule X-TDE-ModuleType=Library