From 50b6f1f60f14994ff4c520abd1b748c780f8572d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 14:24:26 -0500 Subject: Fix exec icon location and bring it into XDG compliance --- kdesktop/init/Templates/Program.desktop | 2 +- kdesktop/init/Templates/linkProgram.desktop | 2 +- kdesktop/minicli.cpp | 2 +- kdesktop/startupid.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/init/Templates/Program.desktop b/kdesktop/init/Templates/Program.desktop index 263e1a155..9333f3aec 100644 --- a/kdesktop/init/Templates/Program.desktop +++ b/kdesktop/init/Templates/Program.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec= -Icon=exec +Icon=application-x-executable Path= Terminal=false Type=Application diff --git a/kdesktop/init/Templates/linkProgram.desktop b/kdesktop/init/Templates/linkProgram.desktop index 867e9e380..9f31f45d2 100644 --- a/kdesktop/init/Templates/linkProgram.desktop +++ b/kdesktop/init/Templates/linkProgram.desktop @@ -148,6 +148,6 @@ Comment[xh]=Ikhonkco Elitsha Lwesicelo Comment[zh_CN]=新建应用程序链接 Comment[zh_TW]=新建應用程式連結 Comment[zu]=Isixhumanisi esisha esiya kumyaleli -Icon=exec +Icon=application-x-executable Type=Link URL=.source/Program.desktop diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index c8149ad91..45816da08 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -849,7 +849,7 @@ void Minicli::setIcon () m_iconName = TQString::fromLatin1("kmenu"); TQPixmap icon; - if ((m_iconName == "exec") && (m_filterData->iconName() == "exec")) { + if ((m_iconName == "application-x-executable") && (m_filterData->iconName() == "application-x-executable")) { TQPixmap potentialIcon = m_filterData->customIconPixmap(); if (!potentialIcon.isNull()) { icon = potentialIcon; diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 6dd89b126..4027b7e9a 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -182,7 +182,7 @@ void StartupId::start_startupid( const TQString& icon_P ) TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); // return null pixmap if not found if( icon_pixmap.isNull()) - icon_pixmap = SmallIcon( "exec" ); + icon_pixmap = SmallIcon( "application-x-executable" ); if( startup_widget == NULL ) { startup_widget = new TQWidget( NULL, NULL, WX11BypassWM ); -- cgit v1.2.3