Commit 76e0cec0 authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

when encountering non-UTF-8 file names, alert the user with g_message()

Thu Mar 28 21:11:04 2002  Tim Janik  <timj@gtk.org>

        * gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
        names, alert the user with g_message() instead of g_warning() and
        put out the actual conversion error.
parent 1075a5b9
Thu Mar 28 21:11:04 2002 Tim Janik <timj@gtk.org>
* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
names, alert the user with g_message() instead of g_warning() and
put out the actual conversion error.
2002-03-28 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
......
Thu Mar 28 21:11:04 2002 Tim Janik <timj@gtk.org>
* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
names, alert the user with g_message() instead of g_warning() and
put out the actual conversion error.
2002-03-28 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
......
Thu Mar 28 21:11:04 2002 Tim Janik <timj@gtk.org>
* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
names, alert the user with g_message() instead of g_warning() and
put out the actual conversion error.
2002-03-28 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
......
Thu Mar 28 21:11:04 2002 Tim Janik <timj@gtk.org>
* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
names, alert the user with g_message() instead of g_warning() and
put out the actual conversion error.
2002-03-28 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
......
Thu Mar 28 21:11:04 2002 Tim Janik <timj@gtk.org>
* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
names, alert the user with g_message() instead of g_warning() and
put out the actual conversion error.
2002-03-28 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
......
Thu Mar 28 21:11:04 2002 Tim Janik <timj@gtk.org>
* gtk/gtkfilesel.c (open_new_dir): when encountering non-UTF-8 file
names, alert the user with g_message() instead of g_warning() and
put out the actual conversion error.
2002-03-28 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (install_scroll_sync_handler): Don't install
......
......@@ -2964,6 +2964,8 @@ open_new_dir (gchar *dir_name,
for (i = 0; i < entry_count; i += 1)
{
GError *error = NULL;
dirent = g_dir_read_name (directory);
if (!dirent)
......@@ -2974,14 +2976,19 @@ open_new_dir (gchar *dir_name,
return NULL;
}
sent->entries[n_entries].entry_name = g_filename_to_utf8 (dirent, -1, NULL, NULL, NULL);
sent->entries[n_entries].entry_name = g_filename_to_utf8 (dirent, -1, NULL, NULL, &error);
if (sent->entries[n_entries].entry_name == NULL
|| !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL))
{
g_warning (_("The filename %s couldn't be converted to UTF-8. Try setting the environment variable G_BROKEN_FILENAMES."), dirent);
g_message (_("The filename \"%s\" couldn't be converted to UTF-8 "
"(try setting the environment variable G_BROKEN_FILENAMES): %s"),
dirent,
error->message ? error->message : _("Invalid Utf-8"));
g_clear_error (&error);
continue;
}
g_clear_error (&error);
g_string_assign (path, sys_dir_name);
if (path->str[path->len-1] != G_DIR_SEPARATOR)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment