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

7 files changed, 13 insertions, 13 deletions

diff --git a/kaffeine/mimetypes/application/x-mplayer2.desktop b/kaffeine/mimetypes/application/x-mplayer2.desktop
index 7719691..622ae49 100644
--- a/kaffeine/mimetypes/application/x-mplayer2.desktop
+++ b/kaffeine/mimetypes/application/x-mplayer2.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-mplayer2
-Icon=video
+Icon=video-x-generic
 Patterns=*.avi;*.AVI;*.asf;*.wmv;*.ASF;*.WMV;*.asx;*.ASX;*.wma;*.WMA;*.wmx;*.WMX
 Comment=Microsoft Media
 Comment[bn]=মাইক্রোসফ্ট মিডিয়া
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 561e1f2..01949d4 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -419,7 +419,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
 
 	m_isCurrentEntry = UserIcon("playing");
-	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("cdtrack", TDEIcon::Small);
+	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon(""application-x-cda", TDEIcon::Small);
 
 	setXMLFile("kaffeineplaylist.rc");
 	setupActions();
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index 4d188b1..97ab5da 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -933,7 +933,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 	sportSpin->setValue( dvbConfig->senderPort );
 
 	page = addPage(i18n("Misc"),i18n("Misc"),
-		TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
+		TDEGlobal::instance()->iconLoader()->loadIcon( ""application-vnd.tde.misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 	vb = new TQVBoxLayout( page, 6, 6 );
 	gb = new TQGroupBox( "", page );
 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
@@ -976,7 +976,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
 
 	if ( p ) {
 		page = addPage(i18n("DVB plugins"),i18n("DVB plugins"),
-			TDEGlobal::instance()->iconLoader()->loadIcon( "misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
+			TDEGlobal::instance()->iconLoader()->loadIcon( ""application-vnd.tde.misc", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
 		vb = new TQVBoxLayout( page, 6, 6 );
 		gb = new TQGroupBox( "", page );
 		grid = new TQGridLayout( gb, 1, 1, 20, 6 );
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index 3b0a294..1981e55 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -44,7 +44,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	TQLabel* label = NULL;
 
 	//Audio Page
-	frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon("sound", TDEIcon::Panel,
+	frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon(""audio-x-generic", TDEIcon::Panel,
 	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
@@ -57,7 +57,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
 
 	//Video Page
-	frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon("video", TDEIcon::Panel,
+	frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon(""video-x-generic", TDEIcon::Panel,
 	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
index ebee0ff..dd2312b 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
@@ -43,7 +43,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
 
 /****** Audio Filters ******/  
   TQWidget* audioPage = addPage(i18n("Audio"), i18n("Audio Filters"),
-           TDEGlobal::iconLoader()->loadIcon("sound", TDEIcon::Panel, TDEIcon::SizeMedium));
+           TDEGlobal::iconLoader()->loadIcon(""audio-x-generic", TDEIcon::Panel, TDEIcon::SizeMedium));
   TQGridLayout* audioGrid = new TQGridLayout( audioPage, 3, 3 );
   audioGrid->setSpacing( 5 );
 
@@ -76,7 +76,7 @@ FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList&
   
 /****** Video Filters ******/  
   TQWidget* videoPage = addPage(i18n("Video"), i18n("Video Filters"),
-           TDEGlobal::iconLoader()->loadIcon("video", TDEIcon::Panel, TDEIcon::SizeMedium));
+           TDEGlobal::iconLoader()->loadIcon(""video-x-generic", TDEIcon::Panel, TDEIcon::SizeMedium));
   TQGridLayout* videoGrid = new TQGridLayout( videoPage, 3, 3 );
   videoGrid->setSpacing( 5 );
 
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
index 3ec7229..0ec9f38 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -252,9 +252,9 @@ XineConfig::XineConfig(const xine_t* const xine) :
 	{
 		//  kdDebug() << "XineConfig: add page: " << *it << endl;
 		if (*it == "audio")
-			icon = "sound";
+			icon = "audio-x-generic";
 		else if (*it == "video")
-			icon = "video";
+			icon = "video-x-generic";
 		else if (*it == "vcd")
 			icon = "cdrom_unmount";
 		else if (*it == "input")
@@ -264,9 +264,9 @@ XineConfig::XineConfig(const xine_t* const xine) :
 		else if (*it == "media")
 			icon = "cdrom_unmount";
 		else if (*it == "subtitles")
-			icon = "font_bitmap";
+			icon = "application-x-font-snf";
 		else if (*it == "osd")
-			icon = "font_bitmap";
+			icon = "application-x-font-snf";
 		else if (*it == "engine")
 			icon = "exec";
 		else
diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
index 1de9dac..43b8b7e 100644
--- a/kaffeine/src/pref.cpp
+++ b/kaffeine/src/pref.cpp
@@ -123,7 +123,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
 	vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
 
 //-----------misc----------------
-	TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon("misc", TDEIcon::Panel, TDEIcon::SizeMedium));
+	TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon(""application-vnd.tde.misc", TDEIcon::Panel, TDEIcon::SizeMedium));
 	vb = new TQVBoxLayout( misc, 6, 6 );
 	gb = new TQGroupBox(1, Qt::Horizontal, "", misc);
 	gb->setInsideMargin(20);