summaryrefslogtreecommitdiffstats
path: root/xfce/exo/exo-mount-options.patch
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-06-25 08:45:24 +0200
committertnut <thierryn1 at hispeed dot ch>2010-06-25 08:45:24 +0200
commitc55cfab7be6d32cf6d0433f828cae2bc77dc6b62 (patch)
tree2302459f5b22cdc58adfb05432967de5c465853f /xfce/exo/exo-mount-options.patch
parenta81ee3de78ca74c3fe602c6a9d6dd3e8d9f7ac70 (diff)
downloadnutyx-extra-c55cfab7be6d32cf6d0433f828cae2bc77dc6b62.tar.gz
nutyx-extra-c55cfab7be6d32cf6d0433f828cae2bc77dc6b62.tar.bz2
nutyx-extra-c55cfab7be6d32cf6d0433f828cae2bc77dc6b62.tar.xz
nutyx-extra-c55cfab7be6d32cf6d0433f828cae2bc77dc6b62.zip
maj exo#0.5.2-1
Diffstat (limited to 'xfce/exo/exo-mount-options.patch')
-rwxr-xr-xxfce/exo/exo-mount-options.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/xfce/exo/exo-mount-options.patch b/xfce/exo/exo-mount-options.patch
deleted file mode 100755
index 1678062f3..000000000
--- a/xfce/exo/exo-mount-options.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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);