Branch: master

cdc6cd63 2014-10-22 01:27:26 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 extras/system/tdeeject.desktop
M kshutdown/actions.cpp
M kshutdown/mmainwindow.cpp
M kshutdown/msettingsdialog.cpp
diff --git a/extras/system/tdeeject.desktop b/extras/system/tdeeject.desktop
index 02013ef..b9b4f1b 100644
--- a/extras/system/tdeeject.desktop
+++ b/extras/system/tdeeject.desktop
@@ -8,7 +8,7 @@
 Exec=tdeeject /dev/cdrom
 GenericName=
 GenericName[en_US]=
-Icon=cdrom_unmount
+Icon=application-x-cdrom_unmount
 MimeType=
 Path=
 StartupNotify=true
diff --git a/kshutdown/actions.cpp b/kshutdown/actions.cpp
index 4b331e0..a433654 100644
--- a/kshutdown/actions.cpp
+++ b/kshutdown/actions.cpp
@@ -220,7 +220,7 @@
 {
 	TQMapIterator<Type, TQPixmap> i = iconCache->find(action);
 
-	return (i == iconCache->end()) ? SmallIcon("misc") : i.data();
+	return (i == iconCache->end()) ? SmallIcon("application-vnd.tde.misc") : i.data();
 }
 
 TQString Action::getIconName(const Type action) const
diff --git a/kshutdown/mmainwindow.cpp b/kshutdown/mmainwindow.cpp
index e030eb1..4ecf3d8 100644
--- a/kshutdown/mmainwindow.cpp
+++ b/kshutdown/mmainwindow.cpp
@@ -637,7 +637,7 @@
 	cb_delayTypes->insertItem(SmallIcon("messagebox_warning"), i18n("No Delay"));
 	cb_delayTypes->insertItem(SmallIcon("clock"), i18n("Time From Now (HH:MM)"));
 	cb_delayTypes->insertItem(SmallIcon("date"), i18n("At Date/Time"));
-	cb_delayTypes->insertItem(SmallIcon("misc"), i18n("When selected application exit"));
+	cb_delayTypes->insertItem(SmallIcon("application-vnd.tde.misc"), i18n("When selected application exit"));
 	if (MiscUtils::isRestricted("tab_time"))
 		TQWhatsThis::add(cb_delayTypes, i18n("Disabled by the Administrator."));
 	else
diff --git a/kshutdown/msettingsdialog.cpp b/kshutdown/msettingsdialog.cpp
index 95e2480..f4ca335 100644
--- a/kshutdown/msettingsdialog.cpp
+++ b/kshutdown/msettingsdialog.cpp
@@ -205,7 +205,7 @@
 		in_cdTrayCloseCommand, SLOT(setEnabled(bool)));
 
 	// kde settings
-	KPushButton *b_kdeSettings = new KPushButton(SmallIcon("misc"), i18n("Related TDE Settings..."), _advancedPage, "KPushButton::b_kdeSettings");
+	KPushButton *b_kdeSettings = new KPushButton(SmallIcon("application-vnd.tde.misc"), i18n("Related TDE Settings..."), _advancedPage, "KPushButton::b_kdeSettings");
 	connect(b_kdeSettings, SIGNAL(clicked()), SLOT(slotKDESettings()));
 
 	l->addWidget(gb_afterLogin);