[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/locale
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2005-02-22 23:00:08
Message-ID: 20050222230008.5C392EDBC () office ! kde ! org
[Download RAW message or body]

CVS commit by danimo: 

no duplicate entries in case you layer multiple kde installation via KDEDIRS


  M +5 -3      kcmlocale.cpp   1.116


--- kdebase/kcontrol/locale/kcmlocale.cpp  #1.115:1.116
@@ -212,5 +212,6 @@ void KLocaleConfig::loadLanguageList()
   // add all languages to the list
   QStringList alllang = KGlobal::dirs()->findAllResources("locale",
-                               QString::fromLatin1("*/entry.desktop"));
+                               QString::fromLatin1("*/entry.desktop"), 
+                               false, true);
   QStringList langlist = prilang;
   if (langlist.count() > 0)
@@ -261,5 +262,6 @@ void KLocaleConfig::loadCountryList()
 
   QStringList regionlist = KGlobal::dirs()->findAllResources("locale",
-                                 sub + QString::fromLatin1("*.desktop"));
+                                 sub + QString::fromLatin1("*.desktop"), 
+                                 false, true );
 
   for ( QStringList::ConstIterator it = regionlist.begin();
@@ -294,5 +296,5 @@ void KLocaleConfig::loadCountryList()
   // add all languages to the list
   QStringList countrylist = KGlobal::dirs()->findAllResources
-    ("locale", sub + QString::fromLatin1("*/entry.desktop"));
+    ("locale", sub + QString::fromLatin1("*/entry.desktop"), false, true);
 
   for ( QStringList::ConstIterator it = countrylist.begin();


[prev in list] [next in list] [prev in thread] [next in thread]