summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2006-08-23 08:50:27 +0000
committerTor Lillqvist <tml@src.gnome.org>2006-08-23 08:50:27 +0000
commit8dc75116e129c98f1813ce4743885062db72b652 (patch)
tree063663c5d101977b1925330472a534e3db2e31e1
parent153bfe9617fe442ceabec1189c98eb208921416c (diff)
downloadgdk-pixbuf-8dc75116e129c98f1813ce4743885062db72b652.tar.gz
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.
-rw-r--r--ChangeLog4
-rw-r--r--gtk/gtkfilesystemwin32.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3af832060..7bd367255 100644
--- 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 8582a2cb9..12cf23095 100644
--- 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;
}