Improved API and implementation of EphyDialog. Add support for new combo

2003-11-30  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* data/glade/epiphany.glade:
	* data/glade/prefs-dialog.glade:
	* embed/downloader-view.c: (downloader_view_build_ui):
	* embed/ephy-embed-dialog.c: (ephy_embed_dialog_new_with_parent):
	* embed/ephy-encodings.c: (ephy_encodings_get_detectors):
	* embed/ephy-encodings.h:
	* embed/find-dialog.c: (update_navigation_controls),
	(set_properties), (impl_show), (find_dialog_class_init),
	(find_dialog_init), (find_dialog_new_with_parent):
	* embed/print-dialog.c: (impl_show), (print_dialog_init),
	(print_dialog_new_with_parent), (print_get_info):
	* lib/ephy-dialog.c: (ephy_dialog_get_type), (lookup_info),
	(set_sensitivity), (set_value_from_pref), (set_pref_from_value),
	(set_value_from_editable), (set_value_from_optionmenu),
	(set_value_from_combobox), (get_radio_button_active_index),
	(set_value_from_radiobuttongroup), (set_value_from_spin_button),
	(set_value_from_togglebutton), (set_value_from_info),
	(set_editable_from_value), (get_index_from_value),
	(set_optionmenu_from_value), (compare_values),
	(set_combo_box_from_value), (set_radiobuttongroup_from_value),
	(set_spin_button_from_value), (set_togglebutton_from_value),
	(set_info_from_value), (set_pref_from_info),
	(togglebutton_clicked_cb), (radiobutton_clicked_cb),
	(spinbutton_timeout_cb), (spinbutton_changed_cb), (changed_cb),
	(set_info_from_pref), (connect_signals), (disconnect_signals),
	(init_props), (load_info), (save_info), (setup_default_size),
	(dialog_destroy_cb), (impl_construct), (impl_show),
	(ephy_dialog_set_modal), (ephy_dialog_add_enum),
	(ephy_dialog_set_data_column), (ephy_dialog_set_pref),
	(ephy_dialog_set_size_group), (ephy_dialog_construct),
	(ephy_dialog_show), (ephy_dialog_run), (ephy_dialog_get_control),
	(ephy_dialog_get_value), (ephy_dialog_set_value), (free_prop_info),
	(ephy_dialog_init), (ephy_dialog_dispose), (ephy_dialog_finalize),
	(ephy_dialog_set_parent), (ephy_dialog_set_property),
	(ephy_dialog_get_property), (ephy_dialog_class_init),
	(ephy_dialog_new), (ephy_dialog_new_with_parent):
	* lib/ephy-dialog.h:
	* lib/ephy-file-chooser.c: (ephy_file_chooser_new):
	* src/ephy-encoding-dialog.c: (sync_embed_cb),
	(sync_parent_window_cb), (activate_choice),
	(view_node_selected_cb), (view_node_activated_cb),
	(ephy_encoding_dialog_init), (ephy_encoding_dialog_new):
	* src/ephy-shell.c: (ephy_shell_finalize),
	(ephy_shell_get_pdm_dialog), (ephy_shell_get_prefs_dialog):
	* src/ephy-shell.h:
	* src/language-editor.c: (language_editor_get_type),
	(language_editor_class_init), (language_editor_update_pref),
	(language_editor_add_button_clicked_cb),
	(language_editor_set_view), (language_editor_init),
	(language_editor_new), (language_editor_set_model),
	(language_editor_add):
	* src/language-editor.h:
	* src/pdm-dialog.c: (pdm_dialog_show_help),
	(action_treeview_selection_changed_cb), (setup_action),
	(cookies_treeview_selection_changed_cb),
	(pdm_dialog_cookies_construct), (pdm_dialog_passwords_construct),
	(pdm_dialog_init), (show_cookies_properties):
	* src/prefs-dialog.c: (prefs_dialog_get_type),
	(prefs_dialog_class_init), (prefs_dialog_show_help),
	(setup_font_combo), (fonts_language_combo_changed_cb),
	(create_fonts_language_menu), (create_node_combo),
	(language_combo_changed_cb), (create_language_menu),
	(get_download_button_label), (create_download_path_label),
	(prefs_dialog_init), (prefs_dialog_response_cb),
	(set_homepage_entry), (prefs_homepage_current_button_clicked_cb),
	(prefs_homepage_blank_button_clicked_cb),
	(language_dialog_changed_cb),
	(prefs_language_more_button_clicked_cb),
	(download_path_response_cb),
	(prefs_download_path_button_clicked_cb):
	* src/prefs-dialog.h:
	* src/window-commands.c: (window_cmd_edit_prefs):

	Improved API and implementation of EphyDialog. Add support for
	new combo box, and removed optionmenu.

	Port all dialogues to new API and use combobox instead of optionmenus.

2 files changed, 112 insertions, 118 deletions

diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index b80aaf0ec..f6da961e5 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -12,6 +12,11 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -33,6 +38,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	      <signal name="clicked" handler="find_close_button_clicked_cb"/>
 	    </widget>
@@ -44,6 +50,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	      <signal name="clicked" handler="find_prev_button_clicked_cb"/>
 
@@ -54,6 +61,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox85">
@@ -112,6 +123,7 @@
 	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	      <signal name="clicked" handler="find_next_button_clicked_cb"/>
 
@@ -122,6 +134,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox84">
@@ -259,6 +275,7 @@
 	      <property name="label" translatable="yes">C_ase sensitive</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
@@ -278,6 +295,7 @@
 	      <property name="label" translatable="yes">_Wrap around</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="active">False</property>
 	      <property name="inconsistent">False</property>
 	      <property name="draw_indicator">True</property>
@@ -308,6 +326,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <signal name="delete_event" handler="download_dialog_delete_cb"/>
 
   <child>
@@ -330,6 +353,7 @@
 	      <property name="label" translatable="yes">_Pause</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="download_dialog_pause_cb" last_modification_time="Sat, 01 Jun 2002 23:54:37 GMT"/>
 	    </widget>
 	  </child>
@@ -342,6 +366,7 @@
 	      <property name="label">gtk-stop</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="download_dialog_abort_cb" last_modification_time="Sat, 01 Jun 2002 23:54:50 GMT"/>
 	    </widget>
 	  </child>
@@ -408,6 +433,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
   <signal name="response" handler="pdm_dialog_response_cb" last_modification_time="Tue, 17 Jun 2003 22:37:44 GMT"/>
 
@@ -430,6 +460,7 @@
 	      <property name="label">gtk-help</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-11</property>
 	    </widget>
 	  </child>
@@ -442,6 +473,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
@@ -514,6 +546,7 @@
 		      <property name="label">gtk-remove</property>
 		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
 		    </widget>
 		  </child>
 
@@ -526,6 +559,7 @@
 		      <property name="label">gtk-properties</property>
 		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
 		      <signal name="clicked" handler="pdm_dialog_cookies_properties_button_clicked_cb" last_modification_time="Thu, 20 Jun 2002 08:12:23 GMT"/>
 		    </widget>
 		  </child>
@@ -611,6 +645,7 @@
 		      <property name="label">gtk-remove</property>
 		      <property name="use_stock">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
 		    </widget>
 		  </child>
 		</widget>
@@ -666,6 +701,11 @@
   <property name="default_height">420</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
   <signal name="response" handler="ephy_encoding_dialog_response_cb" last_modification_time="Thu, 16 Oct 2003 17:19:06 GMT"/>
 
@@ -688,6 +728,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
@@ -720,6 +761,7 @@
 		  <property name="label" translatable="yes">&lt;b&gt;_Automatic&lt;/b&gt;</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <property name="active">False</property>
 		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
@@ -806,6 +848,7 @@
 		  <property name="label" translatable="yes">&lt;b&gt;Use a different _encoding:&lt;/b&gt;</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <property name="active">False</property>
 		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index 6953594ea..65f2eb942 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkDialog" id="prefs_dialog">
   <property name="border_width">5</property>
@@ -11,6 +12,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
   <signal name="response" handler="prefs_dialog_response_cb" last_modification_time="Sat, 10 May 2003 09:37:44 GMT"/>
 
@@ -33,6 +39,7 @@
 	      <property name="label">gtk-help</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-11</property>
 	    </widget>
 	  </child>
@@ -45,6 +52,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
@@ -204,6 +212,7 @@
 				  <property name="label" translatable="yes">Set to Current _Page</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <signal name="clicked" handler="prefs_homepage_current_button_clicked_cb"/>
 				</widget>
 			      </child>
@@ -216,6 +225,7 @@
 				  <property name="label" translatable="yes">Set to _Blank Page</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <signal name="clicked" handler="prefs_homepage_blank_button_clicked_cb" last_modification_time="Tue, 14 May 2002 10:37:08 GMT"/>
 				</widget>
 			      </child>
@@ -333,7 +343,7 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-                                      <property name="mnemonic_widget">download_path_button</property>
+				      <property name="mnemonic_widget">download_path_button</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -346,9 +356,13 @@
 				    <widget class="GtkButton" id="download_path_button">
 				      <property name="visible">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				  		<signal name="clicked" handler="prefs_download_path_button_clicked_cb"/>
+				      <property name="focus_on_click">True</property>
+				      <signal name="clicked" handler="prefs_download_path_button_clicked_cb"/>
+
+				      <child>
+					<placeholder/>
+				      </child>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -366,11 +380,11 @@
 
 			      <child>
 				<widget class="GtkCheckButton" id="auto_open_downloads_checkbutton">
-				  <property name="visible">False</property>
 				  <property name="can_focus">True</property>
 				  <property name="label" translatable="yes">Automatically open &quot;safe&quot; downloads</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
@@ -527,7 +541,6 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">fonts_language_optionmenu</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -537,16 +550,8 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkOptionMenu" id="fonts_language_optionmenu">
+				    <widget class="GtkComboBox" id="fonts_language_combo">
 				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">-1</property>
-
-				      <child internal-child="menu">
-					<widget class="GtkMenu" id="menu2">
-					  <property name="visible">True</property>
-					</widget>
-				      </child>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -617,7 +622,6 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">combo-entry1</property>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -642,7 +646,6 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">combo-entry5</property>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -655,84 +658,6 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkCombo" id="variable_combo">
-				      <property name="visible">True</property>
-				      <property name="value_in_list">False</property>
-				      <property name="allow_empty">True</property>
-				      <property name="case_sensitive">False</property>
-				      <property name="enable_arrow_keys">True</property>
-				      <property name="enable_arrows_always">False</property>
-
-				      <child internal-child="entry">
-					<widget class="GtkEntry" id="combo-entry1">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">False</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char" translatable="yes">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-				      </child>
-
-				      <child internal-child="list">
-					<widget class="GtkList" id="combo-list1">
-					  <property name="visible">True</property>
-					  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCombo" id="monospace_combo">
-				      <property name="visible">True</property>
-				      <property name="value_in_list">False</property>
-				      <property name="allow_empty">True</property>
-				      <property name="case_sensitive">False</property>
-				      <property name="enable_arrow_keys">True</property>
-				      <property name="enable_arrows_always">False</property>
-
-				      <child internal-child="entry">
-					<widget class="GtkEntry" id="combo-entry5">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">False</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char" translatable="yes">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-				      </child>
-
-				      <child internal-child="list">
-					<widget class="GtkList" id="combo-list5">
-					  <property name="visible">True</property>
-					  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
 				    <widget class="GtkLabel" id="label1217">
 				      <property name="visible">True</property>
 				      <property name="label" translatable="yes">_Minimum size:</property>
@@ -800,6 +725,32 @@
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
+
+				  <child>
+				    <widget class="GtkComboBox" id="variable_combo">
+				      <property name="visible">True</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="y_options">fill</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkComboBox" id="monospace_combo">
+				      <property name="visible">True</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
+				      <property name="y_options">fill</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -822,6 +773,7 @@
 			      <property name="label" translatable="yes">Always use _these fonts</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -927,6 +879,7 @@
 				  <property name="label" translatable="yes">Al_ways use the desktop theme colors</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
@@ -1065,6 +1018,7 @@
 			      <property name="label" translatable="yes">Allow popup _windows</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -1083,6 +1037,7 @@
 			      <property name="label" translatable="yes">Enable _Java</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -1101,6 +1056,7 @@
 			      <property name="label" translatable="yes">Enable Java_Script</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -1200,6 +1156,7 @@
 			      <property name="label" translatable="yes">_Always accept</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -1218,6 +1175,7 @@
 			      <property name="label" translatable="yes">Only _from sites you visit</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -1237,6 +1195,7 @@
 			      <property name="label" translatable="yes">_Never accept</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -1355,7 +1314,7 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-                                      <property name="mnemonic_widget">disk_cache_spin</property>
+				      <property name="mnemonic_widget">disk_cache_spin</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1430,6 +1389,7 @@
 					  <property name="label" translatable="yes">Cl_ear</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
 					  <signal name="clicked" handler="prefs_clear_cache_button_clicked_cb" last_modification_time="Sat, 07 Jun 2003 11:07:21 GMT"/>
 					</widget>
 				      </child>
@@ -1587,7 +1547,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">default_encoding_optionmenu</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1597,10 +1556,8 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="default_encoding_optionmenu">
+				<widget class="GtkComboBox" id="default_encoding_combo">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">-1</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1635,7 +1592,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">auto_encoding_optionmenu</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1645,16 +1601,8 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="auto_encoding_optionmenu">
+				<widget class="GtkComboBox" id="auto_encoding_combo">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">-1</property>
-
-				  <child internal-child="menu">
-				    <widget class="GtkMenu" id="menu6">
-				      <property name="visible">True</property>
-				    </widget>
-				  </child>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1776,7 +1724,6 @@
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">language_optionmenu</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1786,10 +1733,8 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkOptionMenu" id="language_optionmenu">
+				    <widget class="GtkComboBox" id="language_combo">
 				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="history">-1</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1803,9 +1748,10 @@
 				      <property name="visible">True</property>
 				      <property name="can_default">True</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Mo_re...</property>
+				      <property name="label" translatable="yes">_More...</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
 				      <signal name="clicked" handler="prefs_language_more_button_clicked_cb" last_modification_time="Tue, 14 May 2002 11:07:13 GMT"/>
 				    </widget>
 				    <packing>
@@ -1894,6 +1840,11 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -1915,6 +1866,7 @@
 	      <property name="label">gtk-add</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	    </widget>
 	  </child>
@@ -1927,6 +1879,7 @@
 	      <property name="label">gtk-remove</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 	    </widget>
 	  </child>
@@ -1939,6 +1892,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	      <signal name="clicked" handler="language_editor_close_button_cb" last_modification_time="Thu, 16 May 2002 18:58:11 GMT"/>
 	    </widget>
@@ -1978,7 +1932,6 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
-		  <property name="mnemonic_widget">languages_optionmenu</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -1988,10 +1941,8 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkOptionMenu" id="languages_optionmenu">
+		<widget class="GtkComboBox" id="languages_combo">
 		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="history">-1</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>