aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/LDesktop.cpp
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2016-09-23 08:47:32 +0000
committerWeblate <noreply@weblate.org>2016-09-23 08:47:32 +0000
commit3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b (patch)
tree05aac860fdec6f1af2332bbf128a2bac7f27f02b /src-qt5/core/lumina-desktop/LDesktop.cpp
parentTranslated using Weblate (l_TERMINAL@sv (generated)) (diff)
parentTranslated using Weblate (lumina_WM@lt (generated)) (diff)
downloadlumina-3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b.tar.gz
lumina-3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b.tar.bz2
lumina-3b6320ffa0a3fd3e4385df2faa7ac4a5c5d6df0b.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop/LDesktop.cpp')
-rw-r--r--src-qt5/core/lumina-desktop/LDesktop.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp
index e3d946d4..f1b73bc0 100644
--- a/src-qt5/core/lumina-desktop/LDesktop.cpp
+++ b/src-qt5/core/lumina-desktop/LDesktop.cpp
@@ -280,9 +280,8 @@ void LDesktop::UpdateMenu(bool fast){
else if(items[i].startsWith("app::::") && items[i].endsWith(".desktop")){
//Custom *.desktop application
QString file = items[i].section("::::",1,1).simplified();
- bool ok = false;
- XDGDesktop xdgf = LXDG::loadDesktopFile(file, ok);
- if(ok){
+ XDGDesktop xdgf(file);// = LXDG::loadDesktopFile(file, ok);
+ if(xdgf.type!=XDGDesktop::BAD){
deskMenu->addAction( LXDG::findIcon(xdgf.icon,""), xdgf.name)->setWhatsThis(file);
}else{
qDebug() << "Could not load application file:" << file;
bgstack15