From c2f90c2725150a43fca82a3de97a0224db3afb70 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 16 Jun 2002 03:58:44 +0000 Subject: [PATCH] Actually use the UTF-8 filename, so we actually fix #83386. Sat Jun 15 23:53:03 2002 Owen Taylor * 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(). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkfilesel.c | 8 ++++---- 7 files changed, 58 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf72b8e450..a7c6295e02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Jun 15 23:53:03 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c (gtk_file_selection_set_filename): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cf72b8e450..a7c6295e02 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sat Jun 15 23:53:03 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c (gtk_file_selection_set_filename): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index cf72b8e450..a7c6295e02 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sat Jun 15 23:53:03 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c (gtk_file_selection_set_filename): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cf72b8e450..a7c6295e02 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sat Jun 15 23:53:03 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c (gtk_file_selection_set_filename): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cf72b8e450..a7c6295e02 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sat Jun 15 23:53:03 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c (gtk_file_selection_set_filename): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cf72b8e450..a7c6295e02 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sat Jun 15 23:53:03 2002 Owen Taylor + + * 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 * gtk/gtkfilesel.c (gtk_file_selection_set_filename): diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 1f0c2d6819..efc5b1bfff 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -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; }