[gnome-control-center] region: Remove keyboard model selection

[Bastien Nocera <hadess src gnome org>]

commit cef84c51713cc9c5f781dc48af5337623c958e9e
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jan 27 15:50:41 2011 +0000

    region: Remove keyboard model selection
    
    Seeing as all the keyboards should be using the same low-level
    keycode set, when using evdev.

 panels/region/Makefile.am                         |    1 -
 panels/region/gnome-region-panel-model-chooser.ui |  141 ---------
 panels/region/gnome-region-panel-xkb.c            |   57 ----
 panels/region/gnome-region-panel-xkb.h            |    2 -
 panels/region/gnome-region-panel-xkbmc.c          |  336 ---------------------
 panels/region/gnome-region-panel.ui               |   40 +---
 6 files changed, 1 insertions(+), 576 deletions(-)
---
diff --git a/panels/region/Makefile.am b/panels/region/Makefile.am
index 234078c..f002084 100644
--- a/panels/region/Makefile.am
+++ b/panels/region/Makefile.am
@@ -21,7 +21,6 @@ libregion_la_SOURCES =	\
 	gnome-region-panel-lang.c \
 	gnome-region-panel-lang.h \
 	gnome-region-panel-xkb.c \
-	gnome-region-panel-xkbmc.c \
 	gnome-region-panel-xkblt.c \
 	gnome-region-panel-xkbltadd.c \
 	gnome-region-panel-xkbot.c \
diff --git a/panels/region/gnome-region-panel-xkb.c b/panels/region/gnome-region-panel-xkb.c
index a568e9f..7ddb7a8 100644
--- a/panels/region/gnome-region-panel-xkb.c
+++ b/panels/region/gnome-region-panel-xkb.c
@@ -48,57 +48,6 @@ xci_desc_to_utf8 (XklConfigItem * ci)
 }
 
 static void
-set_model_text (GtkWidget * picker, gchar * model)
-{
-	XklConfigItem *ci = xkl_config_item_new ();
-
-	if (model == NULL) {
-		model = initial_config.model;
-		if (model == NULL)
-			model = "";
-	}
-
-	g_snprintf (ci->name, sizeof (ci->name), "%s", model);
-
-	if (xkl_config_registry_find_model (config_registry, ci)) {
-		char *d;
-
-		d = xci_desc_to_utf8 (ci);
-		gtk_button_set_label (GTK_BUTTON (picker), d);
-		g_free (d);
-	} else {
-		gtk_button_set_label (GTK_BUTTON (picker), _("Unknown"));
-	}
-	g_object_unref (G_OBJECT (ci));
-}
-
-static void
-model_key_changed (GSettings * settings, const gchar * key,
-		   GtkBuilder * dialog)
-{
-	if (!strcmp (key, GKBD_KEYBOARD_CONFIG_KEY_MODEL)) {
-		gchar *value =
-		    g_settings_get_string (xkb_keyboard_settings,
-					   GKBD_KEYBOARD_CONFIG_KEY_MODEL);
-		set_model_text (WID ("xkb_model_pick"), value);
-		if (value != NULL)
-			g_free (value);
-
-		enable_disable_restoring (dialog);
-	}
-}
-
-static void
-setup_model_entry (GtkBuilder * dialog)
-{
-	model_key_changed (xkb_keyboard_settings,
-			   GKBD_KEYBOARD_CONFIG_KEY_MODEL, dialog);
-
-	g_signal_connect (xkb_keyboard_settings, "changed",
-			  G_CALLBACK (model_key_changed), dialog);
-}
-
-static void
 cleanup_xkb_tabs (GtkBuilder * dialog,
 		  GObject *where_the_object_wa)
 {
@@ -179,8 +128,6 @@ setup_xkb_tabs (GtkBuilder * dialog)
 	gkbd_keyboard_config_init (&initial_config, engine);
 	gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
 
-	setup_model_entry (dialog);
-
 	g_settings_bind (xkb_desktop_settings,
 			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
 			 WID ("chk_separate_group_per_window"), "active",
@@ -222,10 +169,6 @@ setup_xkb_tabs (GtkBuilder * dialog)
 				  G_CALLBACK (xkb_options_popup_dialog),
 				  dialog);
 
-	g_signal_connect_swapped (G_OBJECT (WID ("xkb_model_pick")),
-				  "clicked", G_CALLBACK (choose_model),
-				  dialog);
-
 	xkb_layouts_register_conf_listener (dialog);
 	xkb_options_register_conf_listener (dialog);
 
diff --git a/panels/region/gnome-region-panel-xkb.h b/panels/region/gnome-region-panel-xkb.h
index 531f23c..e4201a0 100644
--- a/panels/region/gnome-region-panel-xkb.h
+++ b/panels/region/gnome-region-panel-xkb.h
@@ -60,8 +60,6 @@ extern void enable_disable_restoring (GtkBuilder * dialog);
 
 extern void preview_toggled (GtkBuilder * dialog, GtkWidget * button);
 
-extern void choose_model (GtkBuilder * dialog);
-
 extern void xkb_layout_choose (GtkBuilder * dialog);
 
 extern gchar **xkb_layouts_get_selected_list (void);
diff --git a/panels/region/gnome-region-panel.ui b/panels/region/gnome-region-panel.ui
index d3c8011..f924dd5 100644
--- a/panels/region/gnome-region-panel.ui
+++ b/panels/region/gnome-region-panel.ui
@@ -381,45 +381,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkHBox" id="xkb_models_box">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="label48">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Keyboard _model:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">xkb_model_pick</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="xkb_model_pick">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
+                              <placeholder/>
                             </child>
                             <child>
                               <object class="GtkHButtonBox" id="hbuttonbox2">