aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.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/panel-plugins/desktopbar/LDeskBar.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/panel-plugins/desktopbar/LDeskBar.cpp')
-rw-r--r--src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp b/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp
index 48bbface..9903d4fd 100644
--- a/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp
+++ b/src-qt5/core/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp
@@ -130,11 +130,9 @@ void LDeskBarPlugin::updateFiles(){
if(type=="app"){
//Add it to appM
bool ok = false;
- XDGDesktop df = LXDG::loadDesktopFile(path, ok);
- if(ok){
- if( LXDG::checkValidity(df) && !df.isHidden ){
+ XDGDesktop df(path);
+ if(df.isValid() && !df.isHidden){
appM->addAction( newAction(df.filePath, df.name, LXDG::findIcon(df.icon, ":/images/default-application.png")) );
- }
}
}else if(type=="dir"){
//Add it to dirM
bgstack15