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

5 files changed, 6 insertions, 6 deletions

diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index e2feedcee..c0491a181 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -69,7 +69,7 @@ TQString DocEntry::icon() const
   if ( !docExists() ) return "unknown";
 
   if ( isDirectory() ) return "contents2";
-  else return "document2";
+  else return "text-x-generic-template";
 }
 
 void DocEntry::setUrl( const TQString &url )
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 22f530a1f..9590ea54d 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -250,7 +250,7 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem
       // First parameter is ignored if second is an absolute path
       KURL url(KURL("help:/"), docPath);
       TQString icon = KProtocolInfo::icon(*it);
-      if ( icon.isEmpty() ) icon = "document2";
+      if ( icon.isEmpty() ) icon = "text-x-generic-template";
       DocEntry *entry = new DocEntry( *it, url.url(), icon );
       NavigatorItem *item = new NavigatorItem( entry, topItem, prevItem );
       prevItem = item;
@@ -285,7 +285,7 @@ void Navigator::createItemFromDesktopFile( NavigatorItem *topItem,
       // First parameter is ignored if second is an absolute path
       KURL url(KURL("help:/"), docPath);
       TQString icon = desktopFile.readIcon();
-      if ( icon.isEmpty() ) icon = "document2";
+      if ( icon.isEmpty() ) icon = "text-x-generic-template";
       DocEntry *entry = new DocEntry( desktopFile.readName(), url.url(), icon );
       NavigatorItem *item = new NavigatorItem( entry, topItem );
       item->setAutoDeleteDocEntry( true );
diff --git a/khelpcenter/plugins/Manpages/.directory b/khelpcenter/plugins/Manpages/.directory
index cfdea1cfd..5aa1132e0 100644
--- a/khelpcenter/plugins/Manpages/.directory
+++ b/khelpcenter/plugins/Manpages/.directory
@@ -53,7 +53,7 @@ Name[zu]=Amakhasi Ezincwadi zesandla ze-UNIX
 
 DocPath=man:/
 
-Icon=document2
+Icon=text-x-text-x-generic2
 
 X-DOC-Weight=500
 X-DOC-DocumentType=text/man
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 87a6861e4..f96ab3f5d 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -156,7 +156,7 @@ int ScrollKeeperTreeBuilder::insertSection( NavigatorItem *parent,
 void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
                                          const TQDomNode &docNode )
 {
-  DocEntry *entry = new DocEntry( "", "", "document2" );
+  DocEntry *entry = new DocEntry( "", "", "text-x-generic-template" );
   NavigatorItem *docItem = new NavigatorItem( entry, parent );
   docItem->setAutoDeleteDocEntry( true );
   mItems.append( docItem );
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 19bcb01c0..abd8019fe 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -255,7 +255,7 @@ TOCSectionItem::TOCSectionItem( TOC *toc, TOCChapterItem *parent, TQListViewItem
 	: TOCItem( toc, parent, after, title ),
 	m_name( name )
 {
-	setPixmap( 0, SmallIcon( "document" ) );
+	setPixmap( 0, SmallIcon( "text-x-generic" ) );
 	entry()->setUrl(url());
 }