aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/lumina-desktop/panel-plugins/desktopbar
diff options
context:
space:
mode:
authorWeblate <noreply@weblate.org>2016-09-23 07:34:07 +0000
committerWeblate <noreply@weblate.org>2016-09-23 07:34:07 +0000
commitc0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60 (patch)
tree2c8d0d6eab74377d1d6645b90db9f430472212c6 /src-qt5/core/lumina-desktop/panel-plugins/desktopbar
parentTranslated using Weblate (lumina_DESKTOP@sv (generated)) (diff)
parentLarge update to how XDGDesktop files are created/used. (diff)
downloadlumina-c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60.tar.gz
lumina-c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60.tar.bz2
lumina-c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop/panel-plugins/desktopbar')
-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