Sort the lists of encoding autodetectors and of fonts languages.

2003-05-29  Christian Persch  <chpe@cvs.gnome.org>

* lib/ephy-langs.h:
* data/glade/prefs-dialog.glade:
* src/prefs-dialog.c: (autodetector_info_free), (prefs_dialog_finalize),
(get_current_language_code), (setup_font_menu), (setup_size_control),
(fonts_language_info_cmp), (create_fonts_language_menu),
(autodetect_encoding_menu_changed_cb), (autodetector_info_cmp),
(find_autodetector_info), (create_encoding_autodetectors_menu),
(prefs_dialog_init):

Sort the lists of encoding autodetectors and of fonts languages.

* data/epiphany.schemas.in:

Document the possible values for the encoding autodetectors.

* embed/mozilla/mozilla-notifiers.cpp: (mozilla_notifiers_init),
(mozilla_default_encoding_notifier),
(mozilla_autodetect_encoding_notifier):

Adapted for the changes in the prefs dialog.
The default encoding notifier now propagates the setting to mozilla :)

2 files changed, 16 insertions, 191 deletions

diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index a50684d32..efceb1dc5 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -417,9 +417,20 @@
         <key>/schemas/apps/epiphany/rendering/autodetect_encoding</key>
         <applyto>/apps/epiphany/rendering/autodetect_encoding</applyto>
         <owner>epiphany</owner>
-        <type>int</type>
-        <default>0</default>
+        <type>string</type>
+        <default></default>
         <locale name="C">
+	<short>The charset autodetector. Empty string means autodetect is off</short>
+	<long>
+	The charset autodetector. Valid entries are <empty string> (autodetectors
+	off), cjk_parallel_state_machine (autodetect east asian encodings),
+	ja_parallel_state_machine (autodetect japanese encodings),
+	ko_parallel_state_machine (autodetect korean encodings), ruprob
+	(autodetect russian encodings), ukprob (autodetect ukrainian encodings),
+	zh_parallel_state_machine (autodetect chinese encodings),
+	zhcn_parallel_state_machine (autodetect simplified chinese encodings) and
+	zhtw_parallel_state_machine (autodetect traditional chinese encodings).
+	</long>
         </locale>
       </schema>
       <schema>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index c4bd6a2e9..69a6cab64 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -710,7 +710,6 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">optionmenu2</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -723,127 +722,14 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkOptionMenu" id="optionmenu2">
+			    <widget class="GtkOptionMenu" id="fonts_language_optionmenu">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-			      <signal name="changed" handler="fonts_language_optionmenu_changed_cb" last_modification_time="Fri, 17 May 2002 10:44:00 GMT"/>
+			      <property name="history">-1</property>
 
 			      <child internal-child="menu">
 				<widget class="GtkMenu" id="menu2">
 				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem18">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Western</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem19">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Central European</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem20">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Japanese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem21">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Traditional Chinese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem22">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Simplified Chinese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem23">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Korean</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem24">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Cyrillic</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem25">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Baltic</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem26">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Greek</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem27">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Turkish</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem28">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Unicode</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem29">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Thai</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem30">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Hebrew</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem31">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Arabic</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
 				</widget>
 			      </child>
 			    </widget>
@@ -2137,83 +2023,11 @@
 			    <widget class="GtkOptionMenu" id="auto_encoding_optionmenu">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
+			      <property name="history">-1</property>
 
 			      <child internal-child="menu">
 				<widget class="GtkMenu" id="menu6">
 				  <property name="visible">True</property>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem39">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Off</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem40">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Chinese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem41">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">East asian</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem42">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Japanese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem43">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Korean</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem44">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Russian</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem45">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Simplified Chinese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem46">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Traditional Chinese</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="menuitem47">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Ukrainian</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
 				</widget>
 			      </child>
 			    </widget>