Branch: master

da8d6afa 2014-10-22 11:55:17 Timothy Pearson
Repair mimetype icon usage, part 1.  The following are not fully verified in source as of this commit due to ubiquity: info, unknown
M kalarm/prefdlg.cpp
M kitchensync/src/aboutpage.cpp
M kontact/src/mainwindow.cpp
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index b76d877..f439d60 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -122,7 +122,7 @@
 	setWFlags(TQt::WDestructiveClose);
 	setIconListAllVisible(true);
 
-	TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("application-vnd.tde.misc"));
+	TQVBox* frame = addVBoxPage(i18n("General"), i18n("General"), DesktopIcon("misc"));
 	mMiscPage = new MiscPrefTab(frame);
 
 	frame = addVBoxPage(i18n("Email"), i18n("Email Alarm Settings"), DesktopIcon("mail_generic"));
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index f7dab2a..4de6987 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -98,7 +98,7 @@
   int iconSize = iconloader->currentSize( TDEIcon::Desktop );
 
   TQString handbook_icon_path = iconloader->iconPath( "contents2",  TDEIcon::Desktop );
-  TQString html_icon_path = iconloader->iconPath( "html",  TDEIcon::Desktop );
+  TQString html_icon_path = iconloader->iconPath( "text-html",  TDEIcon::Desktop );
   TQString wizard_icon_path = iconloader->iconPath( "wizard",  TDEIcon::Desktop );
 
   TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to KitchenSync %1</h2>"
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index d1a054e..1fd7ab8 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -1164,7 +1164,7 @@
   int iconSize = iconloader->currentSize( TDEIcon::Desktop );
 
   TQString handbook_icon_path = iconloader->iconPath( "contents2",  TDEIcon::Desktop );
-  TQString html_icon_path = iconloader->iconPath( "html",  TDEIcon::Desktop );
+  TQString html_icon_path = iconloader->iconPath( "text-html",  TDEIcon::Desktop );
   TQString wizard_icon_path = iconloader->iconPath( "wizard",  TDEIcon::Desktop );
 
   TQString info = i18n( "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"