From 943c993381984a4867cfddc65e5c0572df69ee30 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Mon, 22 Jun 2015 09:06:41 -0400
Subject: 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.

---
 libLumina/LuminaXDG.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'libLumina')

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/")){
-- 
cgit