[gnome-control-center] keyboard: Change precedence for schema in KeyList parser

[Florian MÃllner <fmuellner src gnome org>]

commit 8a858345a8742bb82869261d4739ea6bd80c393d
Author: Florian MÃllner <fmuellner gnome org>
Date:   Wed Jun 29 23:55:53 2011 +0200

    keyboard: Change precedence for schema in KeyList parser
    
    Right now, if both KeyList and KeyListEntry contain a schema element,
    the (global) one of the list wins. This makes it rather cumbersome
    to mix keys of different schemas in a single list, as rather than
    using a default schema and specifying a different one where necessary,
    every key needs its own schema element.
    A brief IRC discussion suggests that the current precedence didn't
    trigger any particular issues before, and neither should changing
    it - so do this to support above case.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=653685

 panels/keyboard/keyboard-shortcuts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/panels/keyboard/keyboard-shortcuts.c b/panels/keyboard/keyboard-shortcuts.c
index a64843b..4ad4848 100644
--- a/panels/keyboard/keyboard-shortcuts.c
+++ b/panels/keyboard/keyboard-shortcuts.c
@@ -481,7 +481,7 @@ parse_start_tag (GMarkupParseContext *ctx,
   key.key = g_strdup (gconf_key);
   key.description = g_strdup (description);
   key.gettext_package = g_strdup (keylist->package);
-  key.schema = keylist->schema ? g_strdup (keylist->schema) : g_strdup (schema);
+  key.schema = schema ? g_strdup (schema) : g_strdup (keylist->schema);
   key.comparison = comparison;
   g_array_append_val (keylist->entries, key);
 }