Fix strings used for errors about invalid keys. Bug #406251.

2007-04-17  Christian Persch  <chpe@gnome.org>

	* gconf/gconf.c: (gconf_key_check), (gconf_valid_key): Fix strings
	used for errors about invalid keys. Bug #406251.

svn path=/trunk/; revision=2396

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 50cef54a..4fed4942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-17  Christian Persch  <chpe@gnome.org>
+
+	* gconf/gconf.c: (gconf_key_check), (gconf_valid_key): Fix strings
+	used for errors about invalid keys. Bug #406251.
+
 2007-03-31  Loïc Minier  <lool@dooz.org>
 
 	* configure.in: Check for the lber lib and append it to LDAP_LIBS if
diff --git a/gconf/gconf.c b/gconf/gconf.c
index 6febb82a..eff22bfc 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -92,7 +92,7 @@ gconf_key_check(const gchar* key, GError** err)
     {
       if (err)
         *err = gconf_error_new (GCONF_ERROR_BAD_KEY,
-				_("Key \"%s\" is NULL"), "(null)");
+				_("Key is NULL"));
       return FALSE;
     }
   else if (!gconf_valid_key (key, &why))
@@ -2664,10 +2664,8 @@ gconf_valid_key      (const gchar* key, gchar** why_invalid)
           if (c > 127)
             {
               if (why_invalid != NULL)
-/*                *why_invalid = g_strdup_printf (_("'\\%o' is not an ASCII character, so isn't allowed in key names"),
-                                                (guint) c);*/
-                *why_invalid = g_strdup_printf (_("'%c' is not an ASCII character, so isn't allowed in key names"), (char) '?');
-
+                *why_invalid = g_strdup_printf (_("'\\%o' is not an ASCII character, so isn't allowed in key names"),
+                                                (guint) c);
               return FALSE;
             }