diff options
| author | Ken Moore <ken@ixsystems.com> | 2017-01-17 11:39:35 -0500 |
|---|---|---|
| committer | Ken Moore <ken@ixsystems.com> | 2017-01-17 11:39:35 -0500 |
| commit | db9a57a59095d807a015ce5fd93aa090dbe0e27a (patch) | |
| tree | 999c5292a5b05a61fede8ab13ccc4e6f05b7b8e3 /src-qt5 | |
| parent | Add an internal icon cache for the standardized mimetype icons. This seems to... (diff) | |
| download | lumina-db9a57a59095d807a015ce5fd93aa090dbe0e27a.tar.gz lumina-db9a57a59095d807a015ce5fd93aa090dbe0e27a.tar.bz2 lumina-db9a57a59095d807a015ce5fd93aa090dbe0e27a.zip | |
Adjust the LuminaXDG wildcard replacement routines a bit (%i, %c, etc..) so they block off the replacement within double quotes instead of single-quotes.
Diffstat (limited to 'src-qt5')
| -rw-r--r-- | src-qt5/core/libLumina/LuminaXDG.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp index cb16830d..d92285c5 100644 --- a/src-qt5/core/libLumina/LuminaXDG.cpp +++ b/src-qt5/core/libLumina/LuminaXDG.cpp @@ -220,13 +220,13 @@ QString XDGDesktop::getDesktopExec(QString ActionID){ out = term+" -e "+out; //-e is a nearly-universal flag for terminal emulators } //Now perform any of the XDG flag substitutions as appropriate (9/2014 standards) - if(out.contains("%i") && !icon.isEmpty() ){ out.replace("%i", "--icon \'"+icon+"\'"); } + if(out.contains("%i") && !icon.isEmpty() ){ out.replace("%i", "--icon \""+icon+"\""); } if(out.contains("%c")){ - if(!name.isEmpty()){ out.replace("%c", "\'"+name+"\'"); } - else if(!genericName.isEmpty()){ out.replace("%c", "\'"+genericName+"\'"); } - else{ out.replace("%c", "\'"+filePath.section("/",-1).section(".desktop",0,0)+"\'"); } + if(!name.isEmpty()){ out.replace("%c", "\""+name+"\""); } + else if(!genericName.isEmpty()){ out.replace("%c", "\""+genericName+"\""); } + else{ out.replace("%c", "\""+filePath.section("/",-1).section(".desktop",0,0)+"\""); } } - if(out.contains("%k")){ out.replace("%k", "\'"+filePath+"\'"); } + if(out.contains("%k")){ out.replace("%k", "\""+filePath+"\""); } return out; } |