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

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/hal
From:       Ambroz Bizjak <ambro () b4ever ! net>
Date:       2008-10-29 14:52:51
Message-ID: 1225291971.348305.7483.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 877443 by abizjak:

Unbreak locale handling.
Kernel ntfs driver ("ntfs") uses the "utf8" option, while other
things (e.g. ntfs-3g) may use the "locale=" option.
Also note that the "else" used before the locale option works around
a HAL bug (https://bugs.freedesktop.org/show_bug.cgi?id=17753).
Will check if things work fine on FreeBSD once I install it...


 M  +2 -2      halstorageaccess.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/halstorageaccess.cpp #877442:877443
@@ -292,14 +292,14 @@
             options << "-C="+QString(nl_langinfo(CODESET));
     }
 #else
-    if (fstype=="vfat" || /*fstype.startsWith("ntfs") ||*/ fstype=="iso9660" || fstype=="udf" ) {
+    if (fstype=="vfat" || fstype=="ntfs" || fstype=="iso9660" || fstype=="udf" ) {
         if (halOptions.contains("utf8"))
             options<<"utf8";
         else if (halOptions.contains("iocharset="))
             options<<"iocharset=utf8";
     }
     // pass our locale to the ntfs-3g driver so it can translate local characters
-    else if ( fstype.startsWith("ntfs") && halOptions.contains("locale=") ) {
+    else if ( halOptions.contains("locale=") ) {
         // have to obtain LC_CTYPE as returned by the `locale` command
         // check in the same order as `locale` does
         char *cType;
[prev in list] [next in list] [prev in thread] [next in thread]