diff options
| author | Weblate <noreply@weblate.org> | 2016-09-23 07:34:07 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2016-09-23 07:34:07 +0000 |
| commit | c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60 (patch) | |
| tree | 2c8d0d6eab74377d1d6645b90db9f430472212c6 /src-qt5/core/lumina-desktop/desktop-plugins/desktopview | |
| parent | Translated using Weblate (lumina_DESKTOP@sv (generated)) (diff) | |
| parent | Large update to how XDGDesktop files are created/used. (diff) | |
| download | lumina-c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60.tar.gz lumina-c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60.tar.bz2 lumina-c0d2b4d8d7c7c498ecd8b01fb3da0f93b53b3e60.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/lumina-desktop/desktop-plugins/desktopview')
| -rw-r--r-- | src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp b/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp index 01e174e9..90f3374b 100644 --- a/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp +++ b/src-qt5/core/lumina-desktop/desktop-plugins/desktopview/DesktopViewPlugin.cpp @@ -149,9 +149,8 @@ void DesktopViewPlugin::updateContents(){ it->setIcon( LXDG::findIcon("folder","") ); txt = files[i].fileName(); }else if(files[i].suffix() == "desktop" ){ - bool ok = false; - XDGDesktop desk = LXDG::loadDesktopFile(files[i].absoluteFilePath(), ok); - if(ok){ + XDGDesktop desk(files[i].absoluteFilePath()); + if(desk.isValid()){ it->setIcon( LXDG::findIcon(desk.icon,"unknown") ); if(desk.name.isEmpty()){ txt = files[i].fileName(); |