gnome-settings-daemon r163 - in trunk: . plugins/keyboard

[vuntz svn gnome org]

Author: vuntz
Date: Tue Feb 19 22:15:09 2008
New Revision: 163
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=163&view=rev

Log:
2008-02-19  Vincent Untz  <vuntz gnome org>

	* plugins/keyboard/gsd-keyboard-manager.c:
	(gsd_keyboard_get_hostname_key): escape the hostname before using it in
	a gconf path since it might contain invalid characters.
	Fix bug #517259.


Modified:
   trunk/ChangeLog
   trunk/plugins/keyboard/gsd-keyboard-manager.c

Modified: trunk/plugins/keyboard/gsd-keyboard-manager.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-manager.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-manager.c	Tue Feb 19 22:15:09 2008
@@ -134,12 +134,17 @@
         if (gethostname (hostname, sizeof (hostname)) == 0 &&
             strcmp (hostname, "localhost") != 0 &&
             strcmp (hostname, "localhost.localdomain") != 0) {
-                char *key = g_strconcat (GSD_KEYBOARD_KEY
-                                         "/host-",
-                                         hostname,
-                                         "/0/",
-                                         subkey,
-                                         (char *)NULL);
+                char *escaped;
+                char *key;
+
+                escaped = gconf_escape_key (hostname, -1);
+                key = g_strconcat (GSD_KEYBOARD_KEY
+                                   "/host-",
+                                   escaped,
+                                   "/0/",
+                                   subkey,
+                                   (char *)NULL);
+                g_free (escaped);
                 return key;
         } else
                 return NULL;