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

[jensg svn gnome org]

Author: jensg
Date: Thu Aug 21 17:18:30 2008
New Revision: 460
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=460&view=rev

Log:
2008-08-21  Jens Granseuer  <jensgr gmx net>

	* plugins/keyboard/gsd-keyboard-xkb.c: (apply_xkb_settings): fix a
	constness warning


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

Modified: trunk/plugins/keyboard/gsd-keyboard-xkb.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-xkb.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-xkb.c	Thu Aug 21 17:18:30 2008
@@ -57,7 +57,7 @@
 static const char KNOWN_FILES_KEY[] =
     "/desktop/gnome/peripherals/keyboard/general/known_file_list";
 
-static char *gdm_keyboard_layout = NULL;
+static const char *gdm_keyboard_layout = NULL;
 
 #define noGSDKX
 
@@ -162,7 +162,7 @@
          * screen. Try to keep that setting */
         if (gdm_keyboard_layout != NULL) {
                 if (current_kbd_config.layouts_variants == NULL) {
-                        current_kbd_config.layouts_variants = g_slist_append (NULL, gdm_keyboard_layout);
+                        current_kbd_config.layouts_variants = g_slist_append (NULL, (char *) gdm_keyboard_layout);
                         gconf_client_set_list (conf_client,
                                                GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
                                                GCONF_VALUE_STRING,