Revert accidental translatable string change, use same string for warning

2006-08-23  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path):
	Revert accidental translatable string change, use same string
	for warning as in gtkfilesystemunix.c.

diff --git a/ChangeLog b/ChangeLog
index 0d72985edf591228f6a85a0769f3ffb8addd5a9a..c19d9efd1c1986725e91ed53af493f818a0a4352 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-23  Tor Lillqvist  <tml@novell.com>
 
+       * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path):
+       Revert accidental translatable string change, use same string
+       for warning as in gtkfilesystemunix.c.
+
        * gtk/gtkfilesystemwin32.c (_gtk_file_system_win32_path_compare):
        Fix logic at the end of strings. 
 

diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c
index 8582a2cb9923d8ebe99c1bea90bfa5eb5c90f836..12cf23095016b423105b5e45cdbabcc69ce5fd74 100644 (file)
--- a/gtk/gtkfilesystemwin32.c
+++ b/gtk/gtkfilesystemwin32.c
@@ -1403,13 +1403,17 @@ gtk_file_system_win32_make_path (GtkFileSystem     *file_system,
 
   if ((p = strpbrk (display_name, "<>\"/\\|")))
     {
+      gchar badchar[2];
+
+      badchar[0] = *p;         /* We know it is a single-byte char */
+      badchar[1] = '\0';
       g_set_error (error,
                   GTK_FILE_SYSTEM_ERROR,
                   GTK_FILE_SYSTEM_ERROR_BAD_FILENAME,
-                  _("The name \"%s\" is not valid because it contains the character \"%c\". "
+                  _("The name \"%s\" is not valid because it contains the character \"%s\". "
                     "Please use a different name."),
                   display_name,
-                  *p);
+                  badchar);
       return NULL;
     }