region: keyboard_dialog -> region_dialog

        gnome-keyboard-properties -> gnome-region-panel
        has-separator is gone

11 files changed, 16 insertions, 19 deletions

diff --git a/panels/region/gnome-region-panel-layout-chooser.ui b/panels/region/gnome-region-panel-layout-chooser.ui
index 2beb56d0f..2de4c9b41 100644
--- a/panels/region/gnome-region-panel-layout-chooser.ui
+++ b/panels/region/gnome-region-panel-layout-chooser.ui
@@ -9,7 +9,6 @@
     <property name="default_width">670</property>
     <property name="default_height">350</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
diff --git a/panels/region/gnome-region-panel-model-chooser.ui b/panels/region/gnome-region-panel-model-chooser.ui
index 3fe7d4e1c..a89cfc934 100644
--- a/panels/region/gnome-region-panel-model-chooser.ui
+++ b/panels/region/gnome-region-panel-model-chooser.ui
@@ -10,7 +10,6 @@
     <property name="default_width">450</property>
     <property name="default_height">400</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
diff --git a/panels/region/gnome-region-panel-options-dialog.ui b/panels/region/gnome-region-panel-options-dialog.ui
index f92c4cd22..069144480 100644
--- a/panels/region/gnome-region-panel-options-dialog.ui
+++ b/panels/region/gnome-region-panel-options-dialog.ui
@@ -10,7 +10,6 @@
     <property name="default_width">550</property>
     <property name="default_height">400</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
diff --git a/panels/region/gnome-region-panel-xkb.c b/panels/region/gnome-region-panel-xkb.c
index 01dd44975..bc32099fd 100644
--- a/panels/region/gnome-region-panel-xkb.c
+++ b/panels/region/gnome-region-panel-xkb.c
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkb.c
+/* gnome-region-panel-xkb.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
  * Written by: Sergey V. Udaltsov <svu@gnome.org>
@@ -225,7 +225,7 @@ setup_xkb_tabs (GtkBuilder * dialog)
 	xkb_layouts_register_conf_listener (dialog);
 	xkb_options_register_conf_listener (dialog);
 
-	g_signal_connect (G_OBJECT (WID ("keyboard_dialog")),
+	g_signal_connect (G_OBJECT (WID ("region_dialog")),
 			  "destroy", G_CALLBACK (cleanup_xkb_tabs),
 			  dialog);
 
diff --git a/panels/region/gnome-region-panel-xkb.h b/panels/region/gnome-region-panel-xkb.h
index 5f840d753..531f23ca5 100644
--- a/panels/region/gnome-region-panel-xkb.h
+++ b/panels/region/gnome-region-panel-xkb.h
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkb.h
+/* gnome-region-panel-xkb.h
  * Copyright (C) 2003-2007 Sergey V Udaltsov
  *
  * Written by Sergey V. Udaltsov <svu@gnome.org>
diff --git a/panels/region/gnome-region-panel-xkblt.c b/panels/region/gnome-region-panel-xkblt.c
index d7ac639ab..3249c697e 100644
--- a/panels/region/gnome-region-panel-xkblt.c
+++ b/panels/region/gnome-region-panel-xkblt.c
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkblt.c
+/* gnome-region-panel-xkblt.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
  * Written by: Sergey V. Udaltsov <svu@gnome.org>
@@ -341,7 +341,7 @@ show_selected_layout (GtkWidget * button, GtkBuilder * dialog)
 		gchar **layouts_list = xkb_layouts_get_selected_list ();
 		const gchar *id = layouts_list[idx];
 		char *descr = xkb_layout_description_utf8 (id);
-		GtkWidget *parent = WID ("keyboard_dialog");
+		GtkWidget *parent = WID ("region_dialog");
 		GtkWidget *popup =
 		    gkbd_keyboard_drawing_new_dialog (idx, descr);
 		gtk_widget_set_parent (popup, parent);
diff --git a/panels/region/gnome-region-panel-xkbltadd.c b/panels/region/gnome-region-panel-xkbltadd.c
index 736aad4bc..7ef7a4cff 100644
--- a/panels/region/gnome-region-panel-xkbltadd.c
+++ b/panels/region/gnome-region-panel-xkbltadd.c
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkbltadd.c
+/* gnome-region-panel-xkbltadd.c
  * Copyright (C) 2007 Sergey V. Udaltsov
  *
  * Written by: Sergey V. Udaltsov <svu@gnome.org>
@@ -443,7 +443,7 @@ xkb_layout_choose (GtkBuilder * dialog)
 
 	chooser_dialog = gtk_builder_new ();
 	gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
-				   "/gnome-keyboard-properties-layout-chooser.ui",
+				   "/gnome-region-panel-layout-chooser.ui",
 				   NULL);
 	GtkWidget *chooser = CWID ("xkb_layout_chooser");
 	GtkWidget *lang_chooser = CWID ("xkb_languages_available");
@@ -453,7 +453,7 @@ xkb_layout_choose (GtkBuilder * dialog)
 
 	gtk_window_set_transient_for (GTK_WINDOW (chooser),
 				      GTK_WINDOW (WID
-						  ("keyboard_dialog")));
+						  ("region_dialog")));
 
 	xkb_layout_chooser_available_layouts_fill (chooser_dialog,
 						   "xkb_countries_available",
diff --git a/panels/region/gnome-region-panel-xkbmc.c b/panels/region/gnome-region-panel-xkbmc.c
index d6b6a2dfe..dd11db435 100644
--- a/panels/region/gnome-region-panel-xkbmc.c
+++ b/panels/region/gnome-region-panel-xkbmc.c
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkbmc.c
+/* gnome-region-panel-xkbmc.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
  * Written by: Sergey V. Udaltsov <svu@gnome.org>
@@ -309,12 +309,12 @@ choose_model (GtkBuilder * dialog)
     
     chooser_dialog = gtk_builder_new ();
     gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
-                               "/gnome-keyboard-properties-model-chooser.ui",
+                               "/gnome-region-panel-model-chooser.ui",
                                NULL);
 	chooser = CWID ("xkb_model_chooser");
 	gtk_window_set_transient_for (GTK_WINDOW (chooser),
 				      GTK_WINDOW (WID
-						  ("keyboard_dialog")));
+						  ("region_dialog")));
 	current_model_name = g_settings_get_string (xkb_keyboard_settings, GKBD_KEYBOARD_CONFIG_KEY_MODEL);
 
 	prepare_vendors_list (chooser_dialog);
diff --git a/panels/region/gnome-region-panel-xkbot.c b/panels/region/gnome-region-panel-xkbot.c
index 6e076154e..aa5eda203 100644
--- a/panels/region/gnome-region-panel-xkbot.c
+++ b/panels/region/gnome-region-panel-xkbot.c
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkbot.c
+/* gnome-region-panel-xkbot.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
  * Written by: Sergey V. Udaltsov <svu@gnome.org>
@@ -438,13 +438,13 @@ xkb_options_popup_dialog (GtkBuilder * dialog)
 
 	chooser_dialog = gtk_builder_new ();
 	gtk_builder_add_from_file (chooser_dialog, GNOMECC_UI_DIR
-				   "/gnome-keyboard-properties-options-dialog.ui",
+				   "/gnome-region-panel-options-dialog.ui",
 				   NULL);
 
 	chooser = CWID ("xkb_options_dialog");
 	gtk_window_set_transient_for (GTK_WINDOW (chooser),
 				      GTK_WINDOW (WID
-						  ("keyboard_dialog")));
+						  ("region_dialog")));
 	xkb_options_load_options (chooser_dialog);
 
 	g_signal_connect (chooser, "response",
diff --git a/panels/region/gnome-region-panel-xkbpv.c b/panels/region/gnome-region-panel-xkbpv.c
index 809163bfe..5d4027e39 100644
--- a/panels/region/gnome-region-panel-xkbpv.c
+++ b/panels/region/gnome-region-panel-xkbpv.c
@@ -1,4 +1,4 @@
-/* gnome-keyboard-properties-xkbpv.c
+/* gnome-region-panel-xkbpv.c
  * Copyright (C) 2003-2007 Sergey V. Udaltsov
  *
  * Written by: Sergey V. Udaltsov <svu@gnome.org>
diff --git a/panels/region/gnome-region-panel.c b/panels/region/gnome-region-panel.c
index d03540c01..74262eb55 100644
--- a/panels/region/gnome-region-panel.c
+++ b/panels/region/gnome-region-panel.c
@@ -70,7 +70,7 @@ gnome_region_properties_init (GtkBuilder * dialog)
 	create_dialog (dialog);
 	if (dialog) {
 		setup_dialog (dialog);
-		dialog_win = WID ("keyboard_dialog");
+		dialog_win = WID ("region_dialog");
 		/* g_signal_connect (dialog_win, "response",
 		   G_CALLBACK (dialog_response_cb), NULL); */
 	}