[gentoo-commits] gentoo-x86 commit in kde-base/kdebase-kioslaves/files: kdebase-3.5.10-ntfs3g-locale.patch kdebase-3.5.9-ntfs3g-locale.patch

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/10/01 00:46:19

  Added:                kdebase-3.5.10-ntfs3g-locale.patch
                        kdebase-3.5.9-ntfs3g-locale.patch
  Log:
  Rev Bumped 3.5.9 and 3.5.10 to fix the ntfs-3g locale mount issue.
  Fixes bug 238520 - thanks to Ambroz Bizjak.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

Revision  Changes    Path
1.1                  kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.10-ntfs3g-locale.patch?rev=1.1&content-type=text/plain

Index: kdebase-3.5.10-ntfs3g-locale.patch
===================================================================
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
--- kioslave/media/mediamanager/halbackend.cpp	(revision 864098)
+++ kioslave/media/mediamanager/halbackend.cpp	(working copy)
@@ -851,13 +851,6 @@
         result << tmp;
     }
 
-	if ( valids.contains("locale") )
-	{
-		value = config.readBoolEntry( "locale", true );
-		tmp = QString( "locale=%1" ).arg( value ? "true" : "false" );
-		result << tmp;
-	}
-
     if (valids.contains("utf8"))
     {
         value = config.readBoolEntry("utf8", true);
@@ -878,6 +871,15 @@
             result << "shortname=lower";
     }
 
+
+    if (valids.contains("locale") && fstype == "ntfs-3g")
+    {
+        char *cType;
+        if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
+            result << QString("locale=%1").arg(cType);
+        }
+    }
+
     if (valids.contains("sync"))
     {
         value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
@@ -931,7 +933,7 @@
 
     QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
 
-    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 };
+    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
     for (int index = 0; names[index]; ++index)
         if (valids.contains(names[index]))
             config.writeEntry(names[index], valids[names[index]] == "true");
@@ -951,10 +953,6 @@
         config.writeEntry("automount", valids["automount"]);
     }
 
-	if (valids.contains("locale") ) {
-		config.writeEntry("locale", valids["locale"]);
-	}
-
     return true;
 }
 
@@ -1153,11 +1151,6 @@
         soptions << QString("uid=%1").arg(getuid());
     }
 
-    if (valids["locale"] == "true")
-	{
-		soptions << QString("locale=%1").arg( KGlobal::locale()->language() ); 
-	}
-
     if (valids["ro"] == "true")
         soptions << "ro";
 
@@ -1182,6 +1175,11 @@
         soptions << QString("shortname=%1").arg(valids["shortname"]);
     }
 
+    if (valids.contains("locale"))
+    {
+        soptions << QString("locale=%1").arg(valids["locale"]);
+    }
+
     if (valids.contains("journaling"))
     {
         QString option = valids["journaling"];



1.1                  kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdebase-kioslaves/files/kdebase-3.5.9-ntfs3g-locale.patch?rev=1.1&content-type=text/plain

Index: kdebase-3.5.9-ntfs3g-locale.patch
===================================================================
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
--- kioslave/media/mediamanager/halbackend.cpp	(revision 864099)
+++ kioslave/media/mediamanager/halbackend.cpp	(working copy)
@@ -849,6 +849,14 @@
         result << tmp;
     }
 
+    if (valids.contains("locale") && fstype == "ntfs-3g")
+    {
+        char *cType;
+        if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
+            result << QString("locale=%1").arg(cType);
+        }
+    }
+
     if (valids.contains("utf8"))
     {
         value = config.readBoolEntry("utf8", true);
@@ -1149,6 +1157,11 @@
     if (valids["quiet"] == "true")
         soptions << "quiet";
 
+    if (valids.contains("locale"))
+    {
+        soptions << QString("locale=%1").arg(valids["locale"]);
+    }
+
     if (valids["utf8"] == "true")
         soptions << "utf8";