Fix exec icon location and bring it into XDG compliance

8 files changed, 8 insertions, 8 deletions

diff --git a/kicker/applets/run/runapplet.desktop b/kicker/applets/run/runapplet.desktop
index a2d831891..903788f7a 100644
--- a/kicker/applets/run/runapplet.desktop
+++ b/kicker/applets/run/runapplet.desktop
@@ -125,6 +125,6 @@ Comment[vi]=Chạy một lệnh đơn mà không cần mở một thiết bị �
 Comment[wa]=Lancî ene comande seule sins terminå
 Comment[zh_CN]=调用单条命令而无须使用终端窗口
 Comment[zh_TW]=不使用終端機視窗而送出單行指令
-Icon=exec
+Icon=application-x-executable
 X-TDE-Library=run_panelapplet
 X-TDE-UniqueApplet=true
diff --git a/kicker/kicker/buttons/exec.desktop b/kicker/kicker/buttons/exec.desktop
index 522ba45de..85047e00f 100644
--- a/kicker/kicker/buttons/exec.desktop
+++ b/kicker/kicker/buttons/exec.desktop
@@ -121,5 +121,5 @@ Comment[vi]=Trình khởi động các chương trình không có trong thực �
 Comment[wa]=On enondeu po les programes ki n' sont nén dins l' dressêye TDE
 Comment[zh_CN]=启动不在 TDE 菜单中的程序
 Comment[zh_TW]=用於不在 TDE 選單中的程式啟動器
-Icon=exec
+Icon=application-x-executable
 X-TDE-Library=ExecButton
diff --git a/kicker/kicker/buttons/nontdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h
index 0bc3cd9ab..94c7cb59d 100644
--- a/kicker/kicker/buttons/nontdeappbutton.h
+++ b/kicker/kicker/buttons/nontdeappbutton.h
@@ -75,7 +75,7 @@ protected:
 
     // reimplemented from PanelButton
     virtual TQString tileName() { return "URL"; }
-    TQString defaultIcon() const { return "exec"; };
+    TQString defaultIcon() const { return "application-x-executable"; };
 
     // handle drag and drop actions
     virtual void dropEvent(TQDropEvent *ev);
diff --git a/kicker/kicker/buttons/servicebutton.h b/kicker/kicker/buttons/servicebutton.h
index 9d17d1fe5..ac551adb5 100644
--- a/kicker/kicker/buttons/servicebutton.h
+++ b/kicker/kicker/buttons/servicebutton.h
@@ -56,7 +56,7 @@ protected:
     virtual void startDrag();
     virtual void dropEvent(TQDropEvent *);
     virtual void dragEnterEvent(TQDragEnterEvent *);
-    TQString defaultIcon() const { return "exec"; };
+    TQString defaultIcon() const { return "application-x-executable"; };
     bool checkForBackingFile();
 
     KService::Ptr  _service;
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index 9ef4a228b..bc24272db 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -176,7 +176,7 @@ public:
                              const TQString &cmdLine, bool inTerm,
                              TQPopupMenu* opMenu, TQWidget* parent = 0);
     TQString appletType() const { return "ExecButton"; }
-    virtual TQString icon() const { return "exec"; }
+    virtual TQString icon() const { return "application-x-executable"; }
     virtual TQString visibleName() const { return i18n("Non-TDE Application"); }
 };
 
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index aa0c1faf2..6432a1cc1 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -548,7 +548,7 @@ void PanelBrowserMenu::initIconMap()
     _icons->insert("kfm", SmallIcon("kfm"));
     _icons->insert("terminal", SmallIcon("terminal"));
     _icons->insert("txt", SmallIcon("text-plain"));
-    _icons->insert("exec", SmallIcon("exec"));
+    _icons->insert("exec", SmallIcon("application-x-executable"));
     _icons->insert("chardevice", SmallIcon("chardevice"));
 }
 
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 24c42c927..07caa2b55 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -50,7 +50,7 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
                                const TQString &cmd, bool inTerm,
                                TQWidget *parent, const char *name)
     : KDialogBase(parent, name, false, i18n("Non-TDE Application Configuration"), Ok|Cancel, Ok, true),
-      m_icon(icon.isEmpty() ? "exec" : icon),
+      m_icon(icon.isEmpty() ? "application-x-executable" : icon),
       m_iconChanged(false)
 {
     setCaption(i18n("Non-TDE Application Configuration"));
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 8d7949470..b7e069706 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -377,7 +377,7 @@ void PanelServiceMenu::doInitialize()
 
         if (relPath_ == "")
         {
-            insertItem(KickerLib::menuIconSet("exec"), i18n("Add Non-TDE Application"),
+            insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"),
                        this, TQT_SLOT(addNonKDEApp()));
         }