diff --git a/ChangeLog b/ChangeLog index c4cabcd2ad..52e73f2c35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + 2002-11-07 Tor Lillqvist * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c4cabcd2ad..52e73f2c35 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + 2002-11-07 Tor Lillqvist * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c4cabcd2ad..52e73f2c35 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + 2002-11-07 Tor Lillqvist * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c4cabcd2ad..52e73f2c35 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + 2002-11-07 Tor Lillqvist * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c4cabcd2ad..52e73f2c35 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + 2002-11-07 Tor Lillqvist * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c4cabcd2ad..52e73f2c35 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor + + * gtk/gtkfilesel.c (open_new_dir): Escape invalid + filename before printing it out, since it isn't + a valid UTF-8 string. (#94676) + 2002-11-07 Tor Lillqvist * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index ba1316e7c6..705ac797f6 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -3001,10 +3001,12 @@ open_new_dir (gchar *dir_name, if (sent->entries[n_entries].entry_name == NULL || !g_utf8_validate (sent->entries[n_entries].entry_name, -1, NULL)) { + gchar *escaped_str = g_strescape (dirent, NULL); g_message (_("The filename \"%s\" couldn't be converted to UTF-8 " "(try setting the environment variable G_BROKEN_FILENAMES): %s"), - dirent, + escaped_str, error->message ? error->message : _("Invalid Utf-8")); + g_free (escaped_str); g_clear_error (&error); continue; }