aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-06-22 09:06:41 -0400
committerKen Moore <ken@pcbsd.org>2015-06-22 09:06:41 -0400
commit943c993381984a4867cfddc65e5c0572df69ee30 (patch)
tree1575b5323d04a6b493ab64a7e4f77650598a853c
parentAdd lumina-fileinfo and lumina-xconfig to the translation mechanisms. (diff)
downloadlumina-943c993381984a4867cfddc65e5c0572df69ee30.tar.gz
lumina-943c993381984a4867cfddc65e5c0572df69ee30.tar.bz2
lumina-943c993381984a4867cfddc65e5c0572df69ee30.zip
Adjust/verify all the XDG routines which touch a file based on the desktop name to ensure that the proper case is used ("Lumina", or case-insensitive checks). The default apps file (lumina-mimeapps.list) is correct because the specs excplicitly state that it should be the lowercase version of the desktop name.
-rw-r--r--libLumina/LuminaXDG.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp
index dcdb2e38..40752a8c 100644
--- a/libLumina/LuminaXDG.cpp
+++ b/libLumina/LuminaXDG.cpp
@@ -92,17 +92,15 @@ XDGDesktop LXDG::loadDesktopFile(QString filePath, bool& ok){
} //end reading file
file.close();
//If there are OnlyShowIn desktops listed, add them to the name
- if(DF.showInList.contains("lumina", Qt::CaseInsensitive)){
+ if( !DF.showInList.isEmpty() && !DF.showInList.contains("Lumina", Qt::CaseInsensitive) ){
+ /*QStringList added;
//Need to be careful about case insensitivity here - the QList functions don't understand it
for(int i=0; i<DF.showInList.length(); i++){
- if(DF.showInList[i].toLower()=="lumina"){
- DF.showInList.removeAt(i);
- i--;
- }
- }
- }
- if(!DF.showInList.isEmpty()){
- DF.name.append(" ("+DF.showInList.join(", ")+")");
+ if(DF.showInList[i].toLower()!="lumina"){ added << DF.showInList[i]; }
+ }*/
+ //if(!added.isEmpty()){
+ DF.name.append(" ("+DF.showInList.join(", ")+")");
+ //}
}
//Quick fix for showing "wine" applications (which quite often don't list a category, or have other differences)
if(DF.catList.isEmpty() && filePath.contains("/wine/")){
bgstack15