From 2e2f121930f42d58768063c89d2a698a3fe4f42a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 23 Aug 2006 08:48:42 +0000 Subject: [PATCH] Revert accidental translatable string change, use same string for warning 2006-08-23 Tor Lillqvist * gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path): Revert accidental translatable string change, use same string for warning as in gtkfilesystemunix.c. --- ChangeLog | 4 ++++ gtk/gtkfilesystemwin32.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d72985edf..c19d9efd1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-08-23 Tor Lillqvist + * 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 8582a2cb99..12cf230950 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; }