Actually use the UTF-8 filename, so we actually fix #83386.

Sat Jun 15 23:53:03 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkfilesel.c (gtk_file_selection_set_filename):
        Actually use the UTF-8 filename, so we actually
        fix #83386.

        * tests/testgtk.c: Remember the directory as a
        test of gtk_file_selection_set_filename().
This commit is contained in:
Owen Taylor 2002-06-16 03:58:44 +00:00 committed by Owen Taylor
parent 12fa1554d9
commit c2f90c2725
7 changed files with 58 additions and 4 deletions

View File

@ -1,3 +1,12 @@
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):
Actually use the UTF-8 filename, so we actually
fix #83386.
* tests/testgtk.c: Remember the directory as a
test of gtk_file_selection_set_filename().
Sat Jun 15 23:05:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):

View File

@ -1,3 +1,12 @@
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):
Actually use the UTF-8 filename, so we actually
fix #83386.
* tests/testgtk.c: Remember the directory as a
test of gtk_file_selection_set_filename().
Sat Jun 15 23:05:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):

View File

@ -1,3 +1,12 @@
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):
Actually use the UTF-8 filename, so we actually
fix #83386.
* tests/testgtk.c: Remember the directory as a
test of gtk_file_selection_set_filename().
Sat Jun 15 23:05:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):

View File

@ -1,3 +1,12 @@
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):
Actually use the UTF-8 filename, so we actually
fix #83386.
* tests/testgtk.c: Remember the directory as a
test of gtk_file_selection_set_filename().
Sat Jun 15 23:05:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):

View File

@ -1,3 +1,12 @@
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):
Actually use the UTF-8 filename, so we actually
fix #83386.
* tests/testgtk.c: Remember the directory as a
test of gtk_file_selection_set_filename().
Sat Jun 15 23:05:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):

View File

@ -1,3 +1,12 @@
Sat Jun 15 23:53:03 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):
Actually use the UTF-8 filename, so we actually
fix #83386.
* tests/testgtk.c: Remember the directory as a
test of gtk_file_selection_set_filename().
Sat Jun 15 23:05:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (gtk_file_selection_set_filename):

View File

@ -1170,17 +1170,17 @@ gtk_file_selection_set_filename (GtkFileSelection *filesel,
filename_utf8 = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
g_return_if_fail (filename_utf8 != NULL);
last_slash = strrchr (filename, G_DIR_SEPARATOR);
last_slash = strrchr (filename_utf8, G_DIR_SEPARATOR);
if (!last_slash)
{
buf = g_strdup ("");
name = filename;
name = filename_utf8;
}
else
{
buf = g_strdup (filename);
buf[last_slash - filename + 1] = 0;
buf = g_strdup (filename_utf8);
buf[last_slash - filename_utf8 + 1] = 0;
name = last_slash + 1;
}