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

6 files changed, 8 insertions, 8 deletions

diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index fbc947c57..eee9c9ee5 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -239,9 +239,9 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name,
 
     TQPixmap pexec = SmallIcon("exec");
     TQPixmap pstderr = SmallIcon("terminal");
-    TQPixmap pmessage = SmallIcon("info");
-    TQPixmap plogfile = SmallIcon("log");
-    TQPixmap psound = SmallIcon("sound");
+    TQPixmap pmessage = SmallIcon("application-vnd.tde.info");
+    TQPixmap plogfile = SmallIcon("text-x-log");
+    TQPixmap psound = SmallIcon("audio-x-generic");
     TQPixmap ptaskbar = SmallIcon("kicker");
 
     d->pixmaps[COL_EXECUTE] = pexec;
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 0d2df33e0..0aaf2f40e 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -826,7 +826,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( (*it)->mode() != mode )
         mode = (mode_t)0;
       if ( KMimeType::iconForURL(url, mode) != iconStr )
-        iconStr = "tdemultiple";
+        iconStr = "application-vnd.tde.tdemultiple";
       if ( url.directory() != directory )
         directory = TQString::null;
       if ( url.protocol() != protocol )
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index 2f7166ed6..5e7fe804a 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -543,7 +543,7 @@ TQDragObject *KFileDetailView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "tdemultiple", TDEIcon::SizeSmall );
+        pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", TDEIcon::SizeSmall );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( TDEIcon::SizeSmall );
 
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index d4be8a58f..90d2b2a10 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -819,7 +819,7 @@ TQDragObject *KFileIconView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "tdemultiple", iconSize() );
+        pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", iconSize() );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( iconSize() );
 
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index cb7432423..2710d4c08 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
    TQPoint hotspot;
    TQPixmap pixmap;
    if( urls.count() > 1 ){
-      pixmap = DesktopIcon( "tdemultiple", 16 );
+      pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", 16 );
    }
    if( pixmap.isNull() )
       pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index d1bd940eb..13e3e70af 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -752,7 +752,7 @@ TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, TDEIcon::Group _group, in
   TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( _icon, _group,
         _force_size, _state, _path, false );
   if ( pix.isNull() )
-      pix = TDEGlobal::iconLoader()->loadIcon( "unknown", _group,
+      pix = TDEGlobal::iconLoader()->loadIcon( ""text-x-katefilelist", _group,
         _force_size, _state, _path, false );
   return pix;
 }