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, 11 insertions, 11 deletions

diff --git a/juk/playlist.cpp b/juk/playlist.cpp
index 7dce3bb3..de65b6e7 100644
--- a/juk/playlist.cpp
+++ b/juk/playlist.cpp
@@ -403,7 +403,7 @@ Playlist::Playlist(PlaylistCollection *collection, bool delaySetup) :
     setup();
 
     if(!delaySetup)
-	collection->setupPlaylist(this, "midi");
+	collection->setupPlaylist(this, "audio-midi");
 }
 
 Playlist::~Playlist()
@@ -1026,7 +1026,7 @@ TQDragObject *Playlist::dragObject(TQWidget *parent)
     }
 
     KURLDrag *drag = new KURLDrag(urls, parent, "Playlist Items");
-    drag->setPixmap(BarIcon("sound"));
+    drag->setPixmap(BarIcon("audio-x-generic"));
 
     return drag;
 }
@@ -1285,7 +1285,7 @@ void Playlist::read(TQDataStream &s)
     m_blockDataChanged = false;
 
     dataChanged();
-    m_collection->setupPlaylist(this, "midi");
+    m_collection->setupPlaylist(this, "audio-midi");
 }
 
 void Playlist::viewportPaintEvent(TQPaintEvent *pe)
diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index d70b36e9..673506d0 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -177,7 +177,7 @@ void PlaylistCollection::createDynamicPlaylist(const PlaylistList &playlists)
         m_dynamicPlaylist->setPlaylists(playlists);
     else
         m_dynamicPlaylist =
-            new DynamicPlaylist(playlists, this, i18n("Dynamic List"), "midi", false, true);
+            new DynamicPlaylist(playlists, this, i18n("Dynamic List"), "audio-midi", false, true);
 
     PlaylistCollection::raise(m_dynamicPlaylist);
 }
@@ -883,7 +883,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     createAction(i18n("&Rename File"),    TQT_SLOT(slotRenameItems()),  "renameFile", "document-save-as", "CTRL+r");
 
     menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
-    menu->setIconSet(SmallIconSet("image"));
+    menu->setIconSet(SmallIconSet("image-x-generic"));
     menu->insert(createAction(i18n("&View Cover"),
         TQT_SLOT(slotViewCovers()), "viewCover", "viewmag"));
     menu->insert(createAction(i18n("Get Cover From &File..."),
diff --git a/juk/playlistitem.cpp b/juk/playlistitem.cpp
index 085464cb..0339290d 100644
--- a/juk/playlistitem.cpp
+++ b/juk/playlistitem.cpp
@@ -85,7 +85,7 @@ FileHandle PlaylistItem::file() const
 
 const TQPixmap *PlaylistItem::pixmap(int column) const
 {
-    static TQPixmap image(SmallIcon("image"));
+    static TQPixmap image(SmallIcon("image-x-generic"));
     static TQPixmap playing(UserIcon("playing"));
 
     int offset = playlist()->columnOffset();
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 221d03a6..aa86393e 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -527,7 +527,7 @@ void TagEditor::setupLayout()
 	m_fileNameBox->setValidator(new FileNameValidator(TQT_TQOBJECT(m_fileNameBox)));	
 
 	TQLabel *fileNameIcon = new TQLabel(this);
-	fileNameIcon->setPixmap(SmallIcon("sound"));
+	fileNameIcon->setPixmap(SmallIcon("audio-x-generic"));
 	TQWidget *fileNameLabel = addHidden(new TQLabel(m_fileNameBox, i18n("&File name:"), this));
 
 	fileNameLayout->addWidget(addHidden(fileNameIcon));
diff --git a/juk/viewmode.cpp b/juk/viewmode.cpp
index efb0d06c..dab099f2 100644
--- a/juk/viewmode.cpp
+++ b/juk/viewmode.cpp
@@ -372,7 +372,7 @@ void TreeViewMode::addItems(const TQStringList &items, unsigned column)
         PlaylistSearch s(playlists, components, PlaylistSearch::MatchAny, false);
 
         TreeViewItemPlaylist *p = new TreeViewItemPlaylist(playlistBox(), s, item);
-        playlistBox()->setupPlaylist(p, "midi", itemParent);
+        playlistBox()->setupPlaylist(p, "audio-midi", itemParent);
         m_treeViewItems.insert(itemKey, p);
     }
 }
@@ -403,13 +403,13 @@ void TreeViewMode::setupDynamicPlaylists()
     PlaylistBox::Item *i;
     PlaylistBox::Item *collectionItem = PlaylistBox::Item::collectionItem();
     
-    i = new PlaylistBox::Item(collectionItem, "cdimage", i18n("Artists"));
+    i = new PlaylistBox::Item(collectionItem, "application-x-cd-image", i18n("Artists"));
     m_searchCategories.insert("artists", i);
 
-    i = new PlaylistBox::Item(collectionItem, "cdimage", i18n("Albums"));
+    i = new PlaylistBox::Item(collectionItem, "application-x-cd-image", i18n("Albums"));
     m_searchCategories.insert("albums", i);
 
-    i = new PlaylistBox::Item(collectionItem, "cdimage", i18n("Genres"));
+    i = new PlaylistBox::Item(collectionItem, "application-x-cd-image", i18n("Genres"));
     m_searchCategories.insert("genres", i);
 }