Branch: master

2ee8ceae 2014-10-22 11:55:14 Timothy Pearson
Repair mimetype icon usage, part 1.  The following are not fully verified in source as of this commit due to ubiquity: info, unknown
M klipper/configdialog.cpp
M konqueror/keditbookmarks/actionsimpl.cpp
diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp
index 2b36209..8f22070 100644
--- a/klipper/configdialog.cpp
+++ b/klipper/configdialog.cpp
@@ -259,7 +259,7 @@
     TQListViewItem *after = 0L; // QListView's default inserting really sucks
     ActionListIterator it( *list );
 
-    const TQPixmap& doc = SmallIcon( "application-vnd.tde.misc" );
+    const TQPixmap& doc = SmallIcon( "misc" );
     const TQPixmap& exec = SmallIcon( "exec" );
 
     for ( action = it.current(); action; action = ++it ) {
@@ -361,7 +361,7 @@
 void ActionWidget::slotAddAction()
 {
     TQListViewItem *item = new TQListViewItem( listView );
-    item->setPixmap( 0, SmallIcon( "application-vnd.tde.misc" ));
+    item->setPixmap( 0, SmallIcon( "misc" ));
     item->setText( 0, i18n("Click here to set the regexp"));
     item->setText( 1, i18n("<new action>"));
 }
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 67e694d..b1b7c8c 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -202,7 +202,7 @@
         i18n("Export to &Opera Bookmarks..."), "opera", 0,
         TQT_TQOBJECT(actn), TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera");
     (void) new TDEAction(
-        i18n("Export to &HTML Bookmarks..."), "html", 0,
+        i18n("Export to &HTML Bookmarks..."), "text-html", 0,
         TQT_TQOBJECT(actn), TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML");
     (void) new TDEAction(
         i18n("Export to &IE Bookmarks..."), 0,