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

9 files changed, 11 insertions, 11 deletions

diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp
index 4f35eaf..7b00c36 100644
--- a/krusader/BookMan/krbookmark.cpp
+++ b/krusader/BookMan/krbookmark.cpp
@@ -29,7 +29,7 @@ KrBookmark::KrBookmark(TQString name, KURL url, TDEActionCollection *parent, TQS
 			setIcon("folder");
 		} else { // is it an archive?
 			if (KRarcHandler::isArchive(_url))
-				setIcon("tar");
+				setIcon("application-x-tar");
 			else setIcon("folder_html");
 		}
 	}
diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp
index ccd01d7..33d5c12 100644
--- a/krusader/Dialogs/checksumdlg.cpp
+++ b/krusader/Dialogs/checksumdlg.cpp
@@ -230,7 +230,7 @@ CreateChecksumDlg::CreateChecksumDlg(const TQStringList& files, bool containFold
 	// title (icon+text)	
 	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint());
 	TQLabel *p = new TQLabel(plainPage());
-	p->setPixmap(krLoader->loadIcon("binary", TDEIcon::Desktop, 32));
+	p->setPixmap(krLoader->loadIcon(""application-octet-stream", TDEIcon::Desktop, 32));
 	hlayout->addWidget(p);
 	TQLabel *l1 = new TQLabel(i18n("About to calculate checksum for the following files") + 
 		(containFolders ? i18n(" and folders:") : ":"), plainPage());
@@ -331,7 +331,7 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder
 	// title (icon+text)	
 	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint());
 	TQLabel *p = new TQLabel(plainPage());
-	p->setPixmap(krLoader->loadIcon("binary", TDEIcon::Desktop, 32));
+	p->setPixmap(krLoader->loadIcon(""application-octet-stream", TDEIcon::Desktop, 32));
 	hlayout->addWidget(p);
 	TQLabel *l1 = new TQLabel(i18n("About to verify checksum for the following files") +
 		(containFolders ? i18n(" and folders:") : ":"), plainPage());
diff --git a/krusader/Konfigurator/konfigurator.cpp b/krusader/Konfigurator/konfigurator.cpp
index 7a60f4f..a634604 100644
--- a/krusader/Konfigurator/konfigurator.cpp
+++ b/krusader/Konfigurator/konfigurator.cpp
@@ -105,7 +105,7 @@ void Konfigurator::createLayout( int startPage )
     TQPixmap(krLoader->loadIcon("messagebox_warning",TDEIcon::Desktop,32)))));
   // archives
   newContent(new KgArchives(firstTime, widget->addPage(i18n("Archives"),i18n("Customize the way Krusader deals with archives"),
-    TQPixmap(krLoader->loadIcon("tgz",TDEIcon::Desktop,32)))));
+    TQPixmap(krLoader->loadIcon(""application-x-tarz",TDEIcon::Desktop,32)))));
   // dependencies
   newContent(new KgDependencies(firstTime, widget->addPage(i18n("Dependencies"),i18n("Set the full path of the external applications"),
     TQPixmap(krLoader->loadIcon("kr_dependencies",TDEIcon::Desktop,32)))));
diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp
index 62ffbb9..7af89cf 100644
--- a/krusader/Panel/krpopupmenu.cpp
+++ b/krusader/Panel/krpopupmenu.cpp
@@ -213,7 +213,7 @@ void KrPopupMenu::addEmptyMenuEntries() {
 
 void KrPopupMenu::addCreateNewMenu() {
 	createNewPopup.insertItem( krLoader->loadIcon( "folder", TDEIcon::Small ), i18n("Folder..."), MKDIR_ID);
-	createNewPopup.insertItem( krLoader->loadIcon( "txt", TDEIcon::Small ), i18n("Text File..."), NEW_TEXT_FILE_ID);
+	createNewPopup.insertItem( krLoader->loadIcon( ""text-plain", TDEIcon::Small ), i18n("Text File..."), NEW_TEXT_FILE_ID);
 	
 	insertItem( TQPixmap(), &createNewPopup, CREATE_NEW_ID);
 	changeItem( CREATE_NEW_ID, i18n( "Create New" ) );
diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp
index 5a6a35d..700f63a 100644
--- a/krusader/Panel/panelpopup.cpp
+++ b/krusader/Panel/panelpopup.cpp
@@ -79,7 +79,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ),
 	
 	quickBtn = new TQToolButton(this);
 	TQToolTip::add(quickBtn, i18n("Quick Panel: quick way to perform actions"));
-	quickBtn->setPixmap(krLoader->loadIcon( "misc", TDEIcon::Toolbar, 16 ));
+	quickBtn->setPixmap(krLoader->loadIcon( ""application-vnd.tde.misc", TDEIcon::Toolbar, 16 ));
 	quickBtn->setFixedSize(20, 20);
 	quickBtn->setToggleButton(true);
 	btns->insert(quickBtn, QuickPanel);
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
index 0a1d94e..2545aa5 100644
--- a/krusader/krusader.cpp
+++ b/krusader/krusader.cpp
@@ -603,7 +603,7 @@ void Krusader::setupActions() {
                                    TQT_TQOBJECT(MAIN_VIEW), TQT_SLOT( profiles() ), actionCollection(), "profile" );
    actCalculate = new TDEAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0,
                                SLOTS, TQT_SLOT( calcSpace() ), actionCollection(), "calculate" );
-   actCreateChecksum = new TDEAction( i18n( "Create Checksum..." ), "binary", 0,
+   actCreateChecksum = new TDEAction( i18n( "Create Checksum..." ), "application-octet-stream", 0,
                                SLOTS, TQT_SLOT( createChecksum() ), actionCollection(), "create checksum" );
    actMatchChecksum = new TDEAction( i18n( "Verify Checksum..." ), "match_checksum", 0,
                                SLOTS, TQT_SLOT( matchChecksum() ), actionCollection(), "match checksum" );
@@ -713,7 +713,7 @@ void Krusader::setupActions() {
    //                             SLOTS, TQT_SLOT( execFilter() ), actionCollection(), "exec files" );
    actCustomFilter = new TDEAction( i18n( "&Custom" ), SHIFT + Key_F12,
                                   SLOTS, TQT_SLOT( customFilter() ), actionCollection(), "custom files" );
-   actCompare = new TDEAction( i18n( "Compare b&y Content..." ), "tdemultiple", 0,
+   actCompare = new TDEAction( i18n( "Compare b&y Content..." ), "application-vnd.tde.tdemultiple", 0,
                              SLOTS, TQT_SLOT( compareContent() ), actionCollection(), "compare" );
    actMultiRename = new TDEAction( i18n( "Multi &Rename..." ), "krename", SHIFT + Key_F9,
                                  SLOTS, TQT_SLOT( multiRename() ), actionCollection(), "multirename" );
diff --git a/krusader/x-ace.desktop b/krusader/x-ace.desktop
index c8f5270..501e33d 100644
--- a/krusader/x-ace.desktop
+++ b/krusader/x-ace.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=ACE archive
 Hidden=false
-Icon=tgz
+Icon=application-x-tarz
 MimeType=application/x-ace
 Patterns=*.ace;*.ACE
 Type=MimeType
diff --git a/tar/tar.protocol b/tar/tar.protocol
index 79c9ae1..41d5f99 100644
--- a/tar/tar.protocol
+++ b/tar/tar.protocol
@@ -8,5 +8,5 @@ listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
 DocPath=tdeioslave/tar/index.html
-Icon=tar
+Icon=application-x-tar
 Class=:local
diff --git a/tar/zip.protocol b/tar/zip.protocol
index 75a20dc..15e2bb0 100644
--- a/tar/zip.protocol
+++ b/tar/zip.protocol
@@ -8,5 +8,5 @@ listing=Name,Type,Size,Date,Access,Owner,Group,Link
 reading=true
 source=true
 DocPath=tdeioslave/zip/index.html
-Icon=zip
+Icon=application-vnd.tde.overlay.zip
 Class=:local