2006-07-15 Glynn Foster <[email protected]> * control-center.spec: Update. * patches/control-center-04-keyboard-layout.diff, * patches/control-center-06-xkb-workaround.diff, * patches/control-center-14-no-xkb-dialog.diff, * patches/control-center-17-xkb-check-remote-login.diff: Remove these keyboard layout patches to be replaced with a single patch that removes the layout functionality. This affects both the gnome-settings-daemon and the keyboard preference dialog. * control-center-04-remove-xkb-layout.diff: Add new patch. * control-center-*.diff: Rename the rest.

--- control-center-2.12.1.orig/capplets/keyboard/gnome-keyboard-properties-xkb.c	2005-10-14 15:22:53.158945000 -0400
+++ control-center-2.12.1/capplets/keyboard/gnome-keyboard-properties-xkb.c	2005-10-14 15:22:20.419499000 -0400
@@ -69,6 +69,9 @@
   if (model == NULL)
     model = initialConfig.model;
 
+  if (model == NULL)
+    model = "";
+
   g_snprintf (ci.name, sizeof (ci.name), "%s", model);
 
   if (XklConfigFindModel (&ci))