aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/libLumina/LuminaXDG.cpp
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-10-26 18:30:51 -0400
committerKen Moore <ken@ixsystems.com>2017-10-26 18:30:51 -0400
commit9c5f154c2e8cc1ad388732a0bc3ee9bb42f296c6 (patch)
treef36b8c5f944b0e9e6170d59f2423ad1454e89cf6 /src-qt5/core/libLumina/LuminaXDG.cpp
parentStarted incorporating the Grav screensaver to QML (diff)
downloadlumina-9c5f154c2e8cc1ad388732a0bc3ee9bb42f296c6.tar.gz
lumina-9c5f154c2e8cc1ad388732a0bc3ee9bb42f296c6.tar.bz2
lumina-9c5f154c2e8cc1ad388732a0bc3ee9bb42f296c6.zip
Fix a few places where /net/ files are still checked for existance (pauses/delays the session init)
Diffstat (limited to 'src-qt5/core/libLumina/LuminaXDG.cpp')
-rw-r--r--src-qt5/core/libLumina/LuminaXDG.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index fdf51a11..53b59165 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -631,7 +631,7 @@ void XDGDesktopList::populateMenu(QMenu *topmenu, bool byCategory){
void LFileInfo::loadExtraInfo(){
desk = 0;
//Now load the extra information
- if(this->isDir()){
+ if( this->suffix().isEmpty() && (this->absoluteFilePath().startsWith("/net/") || this->isDir()) ){
mime = "inode/directory";
//Special directory icons
QString name = this->fileName().toLower();
@@ -644,6 +644,7 @@ void LFileInfo::loadExtraInfo(){
else if(name=="downloads"){ icon = "folder-downloads"; }
else if(name=="documents"){ icon = "folder-documents"; }
else if(name=="images" || name=="pictures"){ icon = "folder-image"; }
+ else if(this->absoluteFilePath().startsWith("/net/")){ icon = "folder-shared"; }
else if( !this->isReadable() ){ icon = "folder-locked"; }
}else if( this->suffix()=="desktop"){
mime = "application/x-desktop";
@@ -730,7 +731,7 @@ bool LXDG::checkExec(QString exec){
else{
QStringList paths = QString(getenv("PATH")).split(":");
for(int i=0; i<paths.length(); i++){
- if(QFile::exists(paths[i]+"/"+exec)){ return true; }
+ if(QFile::exists(paths[i]+"/"+exec)){ return true; }
}
}
return false; //could not find the executable in the current path(s)
bgstack15