Branch: master

78cca2f4 2014-10-22 01:27:30 Timothy Pearson
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
M kgpg/listkeys.cpp
M khexedit/optiondialog.cc
M ksim/ksimpref.cpp
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index b434d72..4b1f2ee 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -556,7 +556,7 @@
         KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection());
         KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection());
         (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh");
-        TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
+        TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
         TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo");
         TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo");
 
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 789d739..5d97a51 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -426,7 +426,7 @@
 {
   TQString text;
   TQFrame *page = addPage( i18n("Files"), i18n("File Management"),
-			  BarIcon("tdemultiple", TDEIcon::SizeMedium ) );
+			  BarIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeMedium ) );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 52fe424..47b6cf7 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -60,7 +60,7 @@
   TQStringList list;
   list << ' ' + i18n("Miscellaneous") << ' ' + i18n("General");
   TQFrame *general = addHBoxPage(list, i18n("General Options"),
-     SmallIcon("misc"));
+     SmallIcon("application-vnd.tde.misc"));
   m_generalPage = new KSim::GeneralPrefs(general);
   list.clear();