[gnome-control-center] region: Make 'Add' dialogs consistent

[Bastien Nocera <hadess src gnome org>]

commit 5a2f836e745db71e1a55a38085d150d13fe91a2d
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 3 22:09:49 2012 -0500

    region: Make 'Add' dialogs consistent
    
    These dialogs had an inconsistent mix of bold window titles and
    non-bold headings. Change them to all use window titles with similar
    wording.
    https://bugzilla.gnome.org/show_bug.cgi?id=684829

 panels/common/cc-language-chooser.c               |    5 +----
 panels/common/language-chooser.ui                 |   14 +-------------
 panels/region/gnome-region-panel-input-chooser.ui |   15 +--------------
 3 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
index 6a885d0..ab072bf 100644
--- a/panels/common/cc-language-chooser.c
+++ b/panels/common/cc-language-chooser.c
@@ -269,7 +269,6 @@ cc_language_chooser_new (GtkWidget *parent, gboolean regions)
         GtkWidget *list;
         GtkWidget *button;
 	GtkWidget *entry;
-        GtkWidget *widget;
         GHashTable *user_langs;
         GdkCursor *cursor;
         guint timeout;
@@ -289,9 +288,7 @@ cc_language_chooser_new (GtkWidget *parent, gboolean regions)
         chooser = (GtkWidget *) gtk_builder_get_object (builder, "dialog");
 
         if (regions) {
-                widget = (GtkWidget *) gtk_builder_get_object (builder, "title");
-                gtk_label_set_text (GTK_LABEL (widget), _("Select a region"));
-
+                gtk_window_set_title (GTK_WINDOW (chooser), _("Select a region"));
                 /* communicate the preference to finish_language_chooser() */
                 g_object_set_data (G_OBJECT (chooser), "regions", GINT_TO_POINTER (TRUE));
         }
diff --git a/panels/common/language-chooser.ui b/panels/common/language-chooser.ui
index a6ef96a..e3aa17d 100644
--- a/panels/common/language-chooser.ui
+++ b/panels/common/language-chooser.ui
@@ -6,7 +6,7 @@
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
-    <property name="title"> </property>
+    <property name="title" translatable="yes">Select a language</property>
     <property name="icon_name">system-users</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="content-area">
@@ -16,18 +16,6 @@
 	<property name="margin_left">10</property>
    	<property name="margin_right">10</property>
         <child>
-          <object class="GtkLabel" id="title">
-            <property name="visible">True</property>
-	    <property name="halign">start</property>
-            <property name="label" translatable="yes">Select a language</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/panels/region/gnome-region-panel-input-chooser.ui b/panels/region/gnome-region-panel-input-chooser.ui
index c81c856..0a3f346 100644
--- a/panels/region/gnome-region-panel-input-chooser.ui
+++ b/panels/region/gnome-region-panel-input-chooser.ui
@@ -18,7 +18,7 @@
     <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Choose an input source</property>
+    <property name="title" translatable="yes">Select an input source</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -81,19 +81,6 @@
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Select an input source to add</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow1">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>