Branch: master

23bcaa99 2014-10-22 01:27:29 Timothy Pearson
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
M atlantik/libatlantikui/estatedetails.cpp
M kolf/kolf.cpp
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 45cc4c1..f89ad96 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -218,22 +218,22 @@
 		if (m_estate->price())
 		{
 			infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").arg(m_estate->price()));
-			infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
+			infoText->setPixmap(0, TQPixmap(SmallIcon("application-vnd.tde.info")));
 		}
 
 		// Owner, houses, isMortgaged
 		if (m_estate && m_estate->canBeOwned())
 		{
 			infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
-			infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
+			infoText->setPixmap(0, TQPixmap(SmallIcon("application-vnd.tde.info")));
 
 			if (m_estate->isOwned())
 			{
 				infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").arg(m_estate->houses()));
-				infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
+				infoText->setPixmap(0, TQPixmap(SmallIcon("application-vnd.tde.info")));
 
 				infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
-				infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
+				infoText->setPixmap(0, TQPixmap(SmallIcon("application-vnd.tde.info")));
 			}
 		}
 	}
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index e989688..e5f38b9 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -139,7 +139,7 @@
 	TDEToggleAction *act=new TDEToggleAction(i18n("Enable All Dialog Boxes"), 0, TQT_TQOBJECT(this), TQT_SLOT(enableAllMessages()), actionCollection(), "enableAll");
 	act->setCheckedState(i18n("Disable All Dialog Boxes"));
 
-	soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "sound");
+	soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(emptySlot()), actionCollection(), "audio-x-generic");
 	connect(soundAction, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(soundChanged(bool)));
 	soundAction->setChecked(config->readBoolEntry("sound", true));