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)

diff --git a/ChangeLog b/ChangeLog
index 5589d31ebb6cf1f8b5690e1820aa0864d40d3f87..bbc0b679620f4a75224d328f40e1516781e50eff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5589d31ebb6cf1f8b5690e1820aa0864d40d3f87..bbc0b679620f4a75224d328f40e1516781e50eff 100644 (file)
--- 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)
+
 Thu Nov  7 17:18:06 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5589d31ebb6cf1f8b5690e1820aa0864d40d3f87..bbc0b679620f4a75224d328f40e1516781e50eff 100644 (file)
--- 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)
+
 Thu Nov  7 17:18:06 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5589d31ebb6cf1f8b5690e1820aa0864d40d3f87..bbc0b679620f4a75224d328f40e1516781e50eff 100644 (file)
--- 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)
+
 Thu Nov  7 17:18:06 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5589d31ebb6cf1f8b5690e1820aa0864d40d3f87..bbc0b679620f4a75224d328f40e1516781e50eff 100644 (file)
--- 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)
+
 Thu Nov  7 17:18:06 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5589d31ebb6cf1f8b5690e1820aa0864d40d3f87..bbc0b679620f4a75224d328f40e1516781e50eff 100644 (file)
--- 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)
+
 Thu Nov  7 17:18:06 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_pixbuf): 

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 1d17af5e188aa3e7d46adc88b22a3fda0075d6d4..6ef064431cd9bd915780e6f13593695c3f06ac75 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -3071,10 +3071,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;
        }