diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-11-07 23:24:52 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-11-07 23:24:52 +0000 |
| commit | 055e32ece37b4850a8523eff559dc3e74b06f87d (patch) | |
| tree | 27cd567e5736a3873bc1c58963a2868f0341a27d | |
| parent | 4b5ca53b3272795141bbe743975ebf15b72fae42 (diff) | |
| download | gdk-pixbuf-055e32ece37b4850a8523eff559dc3e74b06f87d.tar.gz | |
Escape invalid filename before printing it out, since it isn't a valid
Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c (open_new_dir): Escape invalid
filename before printing it out, since it isn't
a valid UTF-8 string. (#94676)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkfilesel.c | 4 |
7 files changed, 39 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com> + + * 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 <tml@iki.fi> * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c4cabcd2a..52e73f2c3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com> + + * 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 <tml@iki.fi> * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c4cabcd2a..52e73f2c3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com> + + * 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 <tml@iki.fi> * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c4cabcd2a..52e73f2c3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com> + + * 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 <tml@iki.fi> * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c4cabcd2a..52e73f2c3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com> + + * 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 <tml@iki.fi> * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c4cabcd2a..52e73f2c3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Nov 7 18:09:42 2002 Owen Taylor <otaylor@redhat.com> + + * 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 <tml@iki.fi> * gdk/win32/gdkgeometry-win32.c (gdk_window_copy_area_scroll, diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index ba1316e7c..705ac797f 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; } |