diff options
author | Thierry N <thierryn1 at hispeed dot ch> | 2009-08-21 22:49:29 +0200 |
---|---|---|
committer | Thierry N <thierryn1 at hispeed dot ch> | 2009-08-21 22:49:29 +0200 |
commit | 60f66e3fb8520616da13abeb962c3d73ae0aac19 (patch) | |
tree | b4b12af7bc862924c7c6f3747b6747e2933d9e70 /xfce/exo/exo-mount-options.patch | |
parent | 93ffab5a2d1fa583b6dcb603dd72fdba16c4b6ef (diff) | |
download | nutyx-pakxe-60f66e3fb8520616da13abeb962c3d73ae0aac19.tar.gz nutyx-pakxe-60f66e3fb8520616da13abeb962c3d73ae0aac19.tar.bz2 nutyx-pakxe-60f66e3fb8520616da13abeb962c3d73ae0aac19.tar.xz nutyx-pakxe-60f66e3fb8520616da13abeb962c3d73ae0aac19.zip |
Ajout de exo#0.3.101-2
Diffstat (limited to 'xfce/exo/exo-mount-options.patch')
-rwxr-xr-x | xfce/exo/exo-mount-options.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/xfce/exo/exo-mount-options.patch b/xfce/exo/exo-mount-options.patch new file mode 100755 index 000000000..1678062f3 --- /dev/null +++ b/xfce/exo/exo-mount-options.patch @@ -0,0 +1,41 @@ +diff -Nur -x '*.orig' -x '*~' exo-0.3.4/exo-mount/exo-mount-hal.c exo-0.3.4.new/exo-mount/exo-mount-hal.c +--- exo-0.3.4/exo-mount/exo-mount-hal.c 2008-03-04 19:25:43.000000000 +0100 ++++ exo-0.3.4.new/exo-mount/exo-mount-hal.c 2008-03-04 19:26:14.000000000 +0100 +@@ -676,6 +676,18 @@ + /* check if we know any valid mount options */ + if (G_LIKELY (device->fsoptions != NULL)) + { ++ /* use utf8 on ubuntu by default */ ++ if (strcmp (device->fstype, "vfat") == 0 ++ || strcmp (device->fstype, "iso9660") == 0) ++ { ++ options[n++] = g_strdup_printf ("utf8"); ++ } ++ /* pass the correct locale to ntfs-3g on ubuntu */ ++ if (strcmp (device->fstype, "ntfs") == 0) ++ { ++ options[n++] = g_strdup_printf ("locale=%s", setlocale (LC_ALL, "")); ++ } ++ + /* process all valid mount options */ + for (m = 0; device->fsoptions[m] != NULL; ++m) + { +@@ -725,8 +737,16 @@ + ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_") + : g_strdup (""); + +- /* let HAL guess the fstype */ +- fstype = g_strdup (""); ++ if (strcmp (device->fstype, "ntfs") == 0) ++ { ++ /* override ntfs with ntfs-3g on ubuntu */ ++ fstype = g_strdup ("ntfs-3g"); ++ } ++ else ++ { ++ /* let HAL guess the fstype */ ++ fstype = g_strdup (""); ++ } + + /* setup the D-Bus error */ + dbus_error_init (&derror); |