summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-28 20:55:51 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-06-03 18:06:55 +0200
commitb8bcb63f0bae3045698731fe6c5b33f97a05c729 (patch)
treeb3abc8f34d4078e9b0d3f248991a65e7fa67aa57
parent4f0b30084127a5f67802b5f57455c41d55eea1b1 (diff)
downloaddrakx-net-b8bcb63f0bae3045698731fe6c5b33f97a05c729.tar
drakx-net-b8bcb63f0bae3045698731fe6c5b33f97a05c729.tar.gz
drakx-net-b8bcb63f0bae3045698731fe6c5b33f97a05c729.tar.bz2
drakx-net-b8bcb63f0bae3045698731fe6c5b33f97a05c729.tar.xz
drakx-net-b8bcb63f0bae3045698731fe6c5b33f97a05c729.zip
fix handling UTF-8 directories (mga#13354)
-rw-r--r--NEWS3
-rwxr-xr-xbin/draknfs2
-rwxr-xr-xbin/draksambashare2
3 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 70b7f4f..fa8e0c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- draknfs, draksambashare:
+ o fix handling UTF-8 directories (mga#13354)
+
2.21
- Fix double entry in menu for drakx-net (mga#15835)
diff --git a/bin/draknfs b/bin/draknfs
index 1b6f835..8d5f90e 100755
--- a/bin/draknfs
+++ b/bin/draknfs
@@ -104,6 +104,8 @@ sub show_file_dialog {
if ($answer eq 'ok') {
my $file = $file_dlg->get_filename;
-d $file or err_dialog(N("Error!"), N("Should be a directory.")) and return;
+ # get_filename() returns UTF-8:
+ c::set_tagged_utf8($file);
$data->set_text($file);
}
$file_dlg->hide;
diff --git a/bin/draksambashare b/bin/draksambashare
index 9fb8749..e55e7bd 100755
--- a/bin/draksambashare
+++ b/bin/draksambashare
@@ -232,6 +232,8 @@ sub show_file_dialog {
if ($answer eq 'ok') {
my $file = $file_dlg->get_filename;
-d $file or err_dialog(N("Error!"), N("Should be a directory.")) and return;
+ # get_filename() returns UTF-8:
+ c::set_tagged_utf8($file);
$data->set_text($file);
}
$file_dlg->hide;