mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2025-01-12 05:20:17 +00:00
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)
This commit is contained in:
parent
d2caca5e20
commit
933af061e1
@ -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)
|
||||||
|
|
||||||
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
||||||
|
@ -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)
|
||||||
|
|
||||||
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
||||||
|
@ -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)
|
||||||
|
|
||||||
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
||||||
|
@ -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)
|
||||||
|
|
||||||
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
||||||
|
@ -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)
|
||||||
|
|
||||||
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
||||||
|
@ -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)
|
||||||
|
|
||||||
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
Thu Nov 7 17:18:06 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf):
|
||||||
|
@ -3071,10 +3071,12 @@ open_new_dir (gchar *dir_name,
|
|||||||
if (sent->entries[n_entries].entry_name == NULL
|
if (sent->entries[n_entries].entry_name == NULL
|
||||||
|| !g_utf8_validate (sent->entries[n_entries].entry_name, -1, 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 "
|
g_message (_("The filename \"%s\" couldn't be converted to UTF-8 "
|
||||||
"(try setting the environment variable G_BROKEN_FILENAMES): %s"),
|
"(try setting the environment variable G_BROKEN_FILENAMES): %s"),
|
||||||
dirent,
|
escaped_str,
|
||||||
error->message ? error->message : _("Invalid Utf-8"));
|
error->message ? error->message : _("Invalid Utf-8"));
|
||||||
|
g_free (escaped_str);
|
||||||
g_clear_error (&error);
|
g_clear_error (&error);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user