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

16 files changed, 74 insertions, 74 deletions

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 60314680..0e085cd7 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -73,7 +73,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   associatedTextEdit->setTextFormat(TQt::PlainText);*/
 
   // icon for non-empty scripts
-  scriptPixmap = TDEGlobal::iconLoader()->loadIcon("source", TDEIcon::Small);
+  scriptPixmap = TDEGlobal::iconLoader()->loadIcon(""text-x-src", TDEIcon::Small);
 
   // signals and slots connections
   m_formWindow = a_form;
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index c353949c..3d5cabba 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -38,7 +38,7 @@ ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name)
   setDisplayStates(states);
   if (KommanderWidget::inEditor)
   {
-    setPixmap(TDEGlobal::iconLoader()->loadIcon("shellscript", TDEIcon::NoGroup, TDEIcon::SizeMedium));
+    setPixmap(TDEGlobal::iconLoader()->loadIcon(""text-x-script", TDEIcon::NoGroup, TDEIcon::SizeMedium));
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setLineWidth(1);
     setFixedSize(pixmap()->size());
diff --git a/kommander/x-kommander.desktop b/kommander/x-kommander.desktop
index ae09d809..656cad13 100644
--- a/kommander/x-kommander.desktop
+++ b/kommander/x-kommander.desktop
@@ -43,7 +43,7 @@ Comment[uk]=Файл Kommander
 Comment[zh_CN]=Kommander 文件
 Comment[zh_HK]=Kommander 檔案
 Comment[zh_TW]=Kommander 檔案
-Icon=widget_doc
+Icon=application-x-designer
 Type=MimeType
 MimeType=application/x-kommander
 Patterns=*.kmdr;
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index a8a4dc37..51571db3 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -223,7 +223,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) );
 		}
 
-		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() );
+		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap, tab, w->tabPageLabel() );
 		m_tb->tab( tab )->installEventFilter( this );
 		kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() <<
 			" to the tabbar" << endl;
@@ -506,7 +506,7 @@ void KMdiDockContainer::setPixmap( KDockWidget* widget , const TQPixmap& pixmap
 	if ( id == -1 )
 		return ;
 	KMultiTabBarTab *tab = m_tb->tab( id );
-	tab->setIcon( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap );
+	tab->setIcon( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap );
 }
 
 void KMdiDockContainer::save( TQDomElement& dockEl )
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 2b1dfea6..92054dcb 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -1927,10 +1927,10 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 
 void KMdiMainFrm::setupToolViewsForIDEALMode()
 {
-	m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "misc" ), 0L, "Left Dock" );
-	m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "misc" ), 0L, "Right Dock" );
-	m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "misc" ), 0L, "Top Dock" );
-	m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "misc" ), 0L, "Bottom Dock" );
+	m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Left Dock" );
+	m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Right Dock" );
+	m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Top Dock" );
+	m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Bottom Dock" );
 
 	KDockWidget *mainDock = getMainDockWidget();
 	KDockWidget *w = mainDock;
diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop
index 472b07a6..3847bb89 100644
--- a/quanta/quanta.tdevelop
+++ b/quanta/quanta.tdevelop
@@ -263,7 +263,7 @@
       <type icon="" ext="h" name="C++ header" create="template" >
         <descr>Quanta speicfic header</descr>
       </type>
-      <type icon="source_cpp" ext="cpp" name="C++ source" create="template" >
+      <type icon="text-x-c++src" ext="cpp" name="C++ source" create="template" >
         <descr>A new empty C++ file.</descr>
       </type>
     </filetypes>
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 804a4ecd..37202d2f 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -188,7 +188,7 @@ void QuantaInit::initQuanta()
   addToolTreeView(StructTreeView::ref(), i18n("Document Structure"), BarIcon("view_sidetree"), KDockWidget::DockLeft);
   addToolTreeView(m_quanta->scriptTab, i18n("Scripts"), BarIcon("system-run"), KDockWidget::DockLeft);
   m_quanta->m_messageOutputView = addToolTreeView(m_quanta->m_messageOutput, i18n("Messages"), SmallIcon("openterm"), KDockWidget::DockBottom);
-  m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom);
+  m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("application-vnd.tde.info"), KDockWidget::DockBottom);
   m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom);
 
   // Restore the dock layout
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 158ba563..6d3ef86f 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -289,7 +289,7 @@ void QuantaView::updateTab()
         // try to set the icon from mimetype
         TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, TDEIcon::Small));
         if (mimeIcon.isNull())
-          mimeIcon = TQIconSet(SmallIcon("document"));
+          mimeIcon = TQIconSet(SmallIcon("text-x-generic"));
         TQString urlStr = QExtFileInfo::shortName(m_document->url().path());
         if (m_document->isModified())
         {
diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp
index 358fec8a..ac2e840d 100644
--- a/quanta/treeviews/docfolder.cpp
+++ b/quanta/treeviews/docfolder.cpp
@@ -45,7 +45,7 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, TDEConfig *c
     if ( item[0] != '#' ) {
       TQString url = config->readEntry( item );
       DocItem *el = new DocItem( this, TQString(item), basePath+url);
-      el->setPixmap( 0, SmallIcon("info") );
+      el->setPixmap( 0, SmallIcon("application-vnd.tde.info") );
     } else
     if ( item[0] == '#' ) { // current item is folder
       item++; // remove leading #
@@ -75,7 +75,7 @@ DocFolder::DocFolder(TQListView *parent, const TQString &_name, TDEConfig *confi
     if ( item[0] != '#' ) {
       TQString url = config->readEntry( item );
       DocItem *el = new DocItem( this, TQString(item), basePath+url);
-      el->setPixmap( 0, SmallIcon("info") );
+      el->setPixmap( 0, SmallIcon("application-vnd.tde.info") );
     } else
     if ( item[0] == '#' ) { // current item is folder
       item++; // remove leading #
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index 1b438a0e..1de8333b 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -93,18 +93,18 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
   createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
-  createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
+  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu();
 
   m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()));
   m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop()));
   m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate()));
-  m_folderMenu->insertItem(SmallIcon("empty"), i18n("&Create New"), createNewMenu);
+  m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu);
   m_folderMenu->insertSeparator();
   m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject()));
   m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
@@ -113,7 +113,7 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na
   m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
   m_emptyMenu = new TDEPopupMenu();
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 26e6ed43..1bb822b3 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -137,11 +137,11 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   TDEPopupMenu *createNewMenu = new TDEPopupMenu(this);
   createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder()));
-  createNewMenu->insertItem(SmallIcon("document"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
+  createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
@@ -156,7 +156,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name )
   m_folderMenu->insertSeparator();
   m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus()));
   m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu);
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_projectMenu = new TDEPopupMenu(this);
   m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu);
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 5fd761fa..78dbd78e 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -84,7 +84,7 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name )
   m_localDir->excludeFilterRx.setPattern(excludeString);
 
   m_fileMenu = new TDEPopupMenu(this);
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties()));
   m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun()));
   m_fileMenu->insertSeparator();
   m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript()));
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index c1cc3b62..922ea03a 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -109,7 +109,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu();
 
@@ -119,7 +119,7 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL &
   m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
   addColumn(i18n("Upload Tree"), -1);
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index 03a59ac1..7c3ffdc1 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -70,7 +70,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString
               } else
               if (title == "img")
               {
-                setPixmap( 0, SmallIcon("image") );
+                setPixmap( 0, SmallIcon("image-x-generic") );
                 title = space + tag->attributeValue("src");
 
               } else
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index b50665bf..2fa9b7e1 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -153,7 +153,7 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy()));
   m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_fileMenu->insertSeparator();
-  m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
 
   m_folderMenu = new TDEPopupMenu(this);
 
@@ -167,7 +167,7 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name )
   m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste()));
   m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete()));
   m_folderMenu->insertSeparator();
-  m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
+  m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties()));
   m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload()));
 
   m_emptyAreaMenu = new TDEPopupMenu(this);
diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index 3b73cd40..cf9b5788 100644
--- a/tdefilereplace/tdefilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -304,48 +304,48 @@ void TDEFileReplaceLib::setIconForFileEntry(TQListViewItem* item, TQString path)
 
   KeyValueMap extensionMap;
 
-  extensionMap["a"] = "binary";
-  extensionMap["am"] = "shellscript";
-  extensionMap["bz"] = "zip";
-  extensionMap["bz2"] = "zip";
-  extensionMap["c"] = "source_c";
-  extensionMap["cc"] = "source_cpp";
-  extensionMap["cpp"] = "source_cpp";
+  extensionMap["a"] = "application-octet-stream";
+  extensionMap["am"] = "text-x-script";
+  extensionMap["bz"] = "application-vnd.tde.overlay.zip";
+  extensionMap["bz2"] = "application-vnd.tde.overlay.zip";
+  extensionMap["c"] = "text-x-csrc";
+  extensionMap["cc"] = "text-x-c++src";
+  extensionMap["cpp"] = "text-x-c++src";
   extensionMap["eml"] = "message";
-  extensionMap["exe"] = "exec_wine";
-  extensionMap["gz"] = "zip";
-  extensionMap["h"] = "source_h";
-  extensionMap["htm"] = "html";
-  extensionMap["html"] = "html";
-  extensionMap["in"] = "shellscript";
-  extensionMap["java"] = "source_java";
-  extensionMap["jpg"] = "image";
-  extensionMap["kfr"] = "html";
-  extensionMap["kmdr"] = "widget_doc";
-  extensionMap["kwd"] = "kword_kwd";
-  extensionMap["log"] = "log";
-  extensionMap["moc"] = "source_moc";
-  extensionMap["mp3"] = "sound";
-  extensionMap["o"] = "source_o";
-  extensionMap["pdf"] = "pdf";
-  extensionMap["php"] = "source_php";
-  extensionMap["py"] = "source_py";
-  extensionMap["pl"] = "source_pl";
-  extensionMap["p"] = "source_p";
-  extensionMap["ps"] = "postscript";
-  extensionMap["png"] = "image";
-  extensionMap["sa"] = "binary";
-  extensionMap["sh"] = "shellscript";
-  extensionMap["so"] = "binary";
-  extensionMap["tar"] = "tar";
-  extensionMap["tex"] = "tex";
-  extensionMap["tgz"] = "tgz";
-  extensionMap["txt"] = "txt";
-  extensionMap["ui"] = "widget_doc";
+  extensionMap["exe"] = "application-x-mswinurl";
+  extensionMap["gz"] = "application-vnd.tde.overlay.zip";
+  extensionMap["h"] = "text-x-hsrc";
+  extensionMap["htm"] = "text-html";
+  extensionMap["html"] = "text-html";
+  extensionMap["in"] = "text-x-script";
+  extensionMap["java"] = "text-x-java";
+  extensionMap["jpg"] = "image-x-generic";
+  extensionMap["kfr"] = "text-html";
+  extensionMap["kmdr"] = "application-x-designer";
+  extensionMap["kwd"] = "x-office-document";
+  extensionMap["log"] = "text-x-log";
+  extensionMap["moc"] = "text-x-mocsrc";
+  extensionMap["mp3"] = "audio-x-generic";
+  extensionMap["o"] = "text-x-osrc";
+  extensionMap["pdf"] = "application-pdf";
+  extensionMap["php"] = "text-x-php";
+  extensionMap["py"] = "text-x-python";
+  extensionMap["pl"] = "text-x-perl";
+  extensionMap["p"] = "text-x-psrc";
+  extensionMap["ps"] = "application-postscript";
+  extensionMap["png"] = "image-x-generic";
+  extensionMap["sa"] = "application-octet-stream";
+  extensionMap["sh"] = "text-x-script";
+  extensionMap["so"] = "application-octet-stream";
+  extensionMap["tar"] = "application-x-tar";
+  extensionMap["tex"] = "text-x-tex";
+  extensionMap["tgz"] = "application-x-tarz";
+  extensionMap["txt"] = "text-plain";
+  extensionMap["ui"] = "application-x-designer";
   extensionMap["uml"] = "umbrellofile";
-  extensionMap["wav"] = "sound";
-  extensionMap["xml"] = "html";
-  extensionMap["xpm"] = "image";
+  extensionMap["wav"] = "audio-x-generic";
+  extensionMap["xml"] = "text-html";
+  extensionMap["xpm"] = "image-x-generic";
 
   KeyValueMap::Iterator itExtensionMap;
 
@@ -360,13 +360,13 @@ void TDEFileReplaceLib::setIconForFileEntry(TQListViewItem* item, TQString path)
 
   KeyValueMap baseNameMap;
 
-  baseNameMap["configure"] = "shellscript";
-  baseNameMap["core"] = "core";
-  baseNameMap["makefile"] = "make";
-  baseNameMap["readme"] = "readme";
-  baseNameMap["README"] = "readme";
-  baseNameMap["Readme"] = "readme";
-  baseNameMap["TODO"] = "txt";
+  baseNameMap["configure"] = "text-x-script";
+  baseNameMap["core"] = "application-x-core";
+  baseNameMap["makefile"] = "text-x-makefile";
+  baseNameMap["readme"] = "text-x-readme";
+  baseNameMap["README"] = "text-x-readme";
+  baseNameMap["Readme"] = "text-x-readme";
+  baseNameMap["TODO"] = "text-plain";
 
   KeyValueMap::Iterator itBaseNameMap;