Index: data/glade/prefs-dialog.glade
===================================================================
RCS file: /cvs/gnome/epiphany/data/glade/prefs-dialog.glade,v
retrieving revision 1.32
diff -u -p -r1.32 prefs-dialog.glade
--- data/glade/prefs-dialog.glade	20 Dec 2003 11:51:10 -0000	1.32
+++ data/glade/prefs-dialog.glade	3 Jan 2004 11:38:09 -0000
@@ -1638,417 +1638,6 @@
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox191">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label1298">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Languages&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox176">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label1299">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkTable" id="table71">
-			  <property name="visible">True</property>
-			  <property name="n_rows">1</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">6</property>
-
-			  <child>
-			    <widget class="GtkVButtonBox" id="vbuttonbox2">
-			      <property name="visible">True</property>
-			      <property name="layout_style">GTK_BUTTONBOX_START</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkButton" id="lang_add_button">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="language_editor_add_button_clicked_cb" last_modification_time="Sun, 30 Nov 2003 21:13:44 GMT"/>
-
-				  <child>
-				    <widget class="GtkAlignment" id="alignment4">
-				      <property name="visible">True</property>
-				      <property name="xalign">0.5</property>
-				      <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="hbox187">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">2</property>
-
-					  <child>
-					    <widget class="GtkImage" id="image4">
-					      <property name="visible">True</property>
-					      <property name="stock">gtk-add</property>
-					      <property name="icon_size">4</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="label1306">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Add...</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="lang_remove_button">
-				  <property name="visible">True</property>
-				  <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>
-				  <signal name="clicked" handler="language_editor_remove_button_clicked_cb" last_modification_time="Sun, 30 Nov 2003 21:14:17 GMT"/>
-
-				  <child>
-				    <widget class="GtkAlignment" id="alignment6">
-				      <property name="visible">True</property>
-				      <property name="xalign">0.5</property>
-				      <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="hbox189">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">2</property>
-
-					  <child>
-					    <widget class="GtkImage" id="image6">
-					      <property name="visible">True</property>
-					      <property name="stock">gtk-remove</property>
-					      <property name="icon_size">4</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="label1308">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Remove</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="lang_up_button">
-				  <property name="visible">True</property>
-				  <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>
-				  <signal name="clicked" handler="language_editor_up_button_clicked_cb" last_modification_time="Sun, 30 Nov 2003 21:14:30 GMT"/>
-
-				  <child>
-				    <widget class="GtkAlignment" id="alignment1">
-				      <property name="visible">True</property>
-				      <property name="xalign">0.5</property>
-				      <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="hbox184">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">2</property>
-
-					  <child>
-					    <widget class="GtkImage" id="image1">
-					      <property name="visible">True</property>
-					      <property name="stock">gtk-go-up</property>
-					      <property name="icon_size">4</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="label1303">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Up</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="lang_down_button">
-				  <property name="visible">True</property>
-				  <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>
-				  <signal name="clicked" handler="language_editor_down_button_clicked_cb" last_modification_time="Sun, 30 Nov 2003 21:14:43 GMT"/>
-
-				  <child>
-				    <widget class="GtkAlignment" id="alignment5">
-				      <property name="visible">True</property>
-				      <property name="xalign">0.5</property>
-				      <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="hbox188">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">2</property>
-
-					  <child>
-					    <widget class="GtkImage" id="image5">
-					      <property name="visible">True</property>
-					      <property name="stock">gtk-go-down</property>
-					      <property name="icon_size">4</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="label1307">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Down</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</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="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkScrolledWindow" id="scrolledwindow2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
-			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			      <child>
-				<widget class="GtkTreeView" id="lang_treeview">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="headers_visible">False</property>
-				  <property name="rules_hint">False</property>
-				  <property name="reorderable">False</property>
-				  <property name="enable_search">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
@@ -2059,7 +1648,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label1286">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Language</property>
+	      <property name="label" translatable="yes">Encodings</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2085,130 +1674,4 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="add_language_dialog">
-  <property name="border_width">5</property>
-  <property name="title" translatable="yes">Add Language</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <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">
-    <widget class="GtkVBox" id="dialog-vbox3">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">2</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area3">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</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">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</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">-5</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox198">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1309">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Choose a l_anguage:</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="mnemonic_widget">languages_treeview</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="languages_treeview">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">False</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
 </glade-interface>
Index: src/prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/prefs-dialog.c,v
retrieving revision 1.62
diff -u -p -r1.62 prefs-dialog.c
--- src/prefs-dialog.c	29 Dec 2003 21:05:08 -0000	1.62
+++ src/prefs-dialog.c	3 Jan 2004 11:38:09 -0000
@@ -73,93 +73,9 @@ void prefs_homepage_current_button_click
 						 EphyDialog *dialog);
 void prefs_homepage_blank_button_clicked_cb	(GtkWidget *button,
 						 EphyDialog *dialog);
-void prefs_language_more_button_clicked_cb	(GtkWidget *button,
-						 EphyDialog *dialog);
+
 void prefs_download_path_button_clicked_cb	(GtkWidget *button,
 						 PrefsDialog *dialog);
-void language_editor_add_button_clicked_cb	(GtkWidget *button,
-						 PrefsDialog *pd);
-void language_editor_remove_button_clicked_cb	(GtkWidget *button,
-						 PrefsDialog *pd);
-void language_editor_up_button_clicked_cb	(GtkWidget *button,
-						 PrefsDialog *pd);
-void language_editor_down_button_clicked_cb	(GtkWidget *button,
-						 PrefsDialog *pd);
-
-static const
-struct
-{
-	char *name;
-	char *code;
-}
-languages [] =
-{
-	/**
-	 * please translate like this: "<your language> (System setting)"
-	 * Examples:
-	 * "de"    translation: "Deutsch (Systemeinstellung)"
-	 * "en_AU" translation: "English, Australia (System setting)" or
-	 *                      "Australian English (System setting)"
-	 */ 
-	{ N_("System language"), "system" },
-	{ N_("Afrikaans"), "ak" },
-	{ N_("Albanian"), "sq" },
-	{ N_("Arabic"), "ar" },
-	{ N_("Azerbaijani"), "az" },
-	{ N_("Basque"), "eu" },
-	{ N_("Breton"), "br" },
-	{ N_("Bulgarian"), "bg" },
-	{ N_("Byelorussian"), "be" },
-	{ N_("Catalan"), "ca" },
-	{ N_("Simplified Chinese"), "zh-cn" },
-	{ N_("Traditional Chinese"), "zh-tw" },
-	{ N_("Chinese"), "zh" },
-	{ N_("Croatian"), "hr" },
-	{ N_("Czech"), "cs" },
-	{ N_("Danish"), "da" },
-	{ N_("Dutch"), "nl" },
-	{ N_("English"), "en" },
-	{ N_("Esperanto"), "eo" },
-	{ N_("Estonian"), "et" },
-	{ N_("Faeroese"), "fo" },
-	{ N_("Finnish"), "fi" },
-	{ N_("French"), "fr" },
-	{ N_("Galician"), "gl" },
-	{ N_("German"), "de" },
-	{ N_("Greek"), "el" },
-	{ N_("Hebrew"), "he" },
-	{ N_("Hungarian"), "hu" },
-	{ N_("Icelandic"), "is" },
-	{ N_("Indonesian"), "id" },
-	{ N_("Irish"), "ga" },
-	{ N_("Italian"), "it" },
-	{ N_("Japanese"), "ja" },
-	{ N_("Korean"), "ko" },
-	{ N_("Latvian"), "lv" },
-	{ N_("Lithuanian"), "lt" },
-	{ N_("Macedonian"), "mk" },
-	{ N_("Malay"), "ms" },
-	{ N_("Norwegian/Nynorsk"), "nn" },
-	{ N_("Norwegian/Bokmal"), "nb" },
-	{ N_("Norwegian"), "no" },
-	{ N_("Polish"), "pl" },
-	{ N_("Portuguese"), "pt" },
-	{ N_("Portuguese of Brazil"), "pt-br" },
-	{ N_("Romanian"), "ro" },
-	{ N_("Russian"), "ru" },
-	{ N_("Scottish"), "gd" },
-	{ N_("Serbian"), "sr" },
-	{ N_("Slovak"), "sk" },
-	{ N_("Slovenian"), "sl" },
-	{ N_("Spanish"), "es" },
-	{ N_("Swedish"), "sv" },
-	{ N_("Tamil"), "ta" },
-	{ N_("Turkish"), "tr" },
-	{ N_("Ukrainian"), "uk" },
-	{ N_("Vietnamese"), "vi" },
-	{ N_("Walloon"), "wa" }
-};
-static guint n_languages = G_N_ELEMENTS (languages);
 
 static const
 char *cookies_accept_enum [] =
@@ -238,11 +154,6 @@ enum
 	DEFAULT_ENCODING_PROP,
 	DEFAULT_ENCODING_LABEL_PROP,
 	AUTO_ENCODING_LABEL_PROP,
-	LANGUAGE_ADD_BUTTON_PROP,
-	LANGUAGE_REMOVE_BUTTON_PROP,
-	LANGUAGE_UP_BUTTON_PROP,
-	LANGUAGE_DOWN_BUTTON_PROP,
-	LANGUAGE_TREEVIEW_PROP
 };
 
 static const
@@ -280,26 +191,6 @@ EphyDialogProperty properties [] =
 	{ "default_encoding_combo",	CONF_LANGUAGE_DEFAULT_ENCODING,		PT_AUTOAPPLY,	G_TYPE_STRING },
 	{ "default_encoding_label",	NULL,					PT_NORMAL,	0 },
 	{ "auto_encoding_label",	NULL,					PT_NORMAL,	0 },
-	{ "lang_add_button",		NULL,					PT_NORMAL,	0 },
-	{ "lang_remove_button",		NULL,					PT_NORMAL,	0 },
-	{ "lang_up_button",		NULL,					PT_NORMAL,	0 },
-	{ "lang_down_button",		NULL,					PT_NORMAL,	0 },
-	{ "lang_treeview",		NULL,					PT_NORMAL,	0 },
-
-	{ NULL }
-};
-
-enum
-{
-	LANGUAGE_DIALOG,
-	LANGUAGE_PROP
-};
-
-static const
-EphyDialogProperty add_lang_props [] =
-{
-	{ "add_language_dialog", NULL,	PT_NORMAL,	0 },
-	{ "languages_treeview",	 NULL,	PT_NORMAL,	G_TYPE_STRING },
 
 	{ NULL }
 };
@@ -312,12 +203,6 @@ enum
 
 enum
 {
-	COL_LANG_NAME,
-	COL_LANG_CODE
-};
-
-enum
-{
 	COL_ENC_NAME,
 	COL_ENC_CODE
 };
@@ -327,13 +212,6 @@ enum
 struct PrefsDialogPrivate
 {
 	GtkWidget *download_dir_chooser;
-	GtkTreeView *lang_treeview;
-	GtkTreeModel *lang_model;
-	EphyDialog *add_lang_dialog;
-	GtkWidget *lang_add_button;
-	GtkWidget *lang_remove_button;
-	GtkWidget *lang_up_button;
-	GtkWidget *lang_down_button;
 };
 
 static GObjectClass *parent_class = NULL;
@@ -371,14 +249,6 @@ prefs_dialog_finalize (GObject *object)
 {
 	PrefsDialog *dialog = EPHY_PREFS_DIALOG (object);
 
-	if (dialog->priv->add_lang_dialog != NULL)
-	{
-		g_object_remove_weak_pointer
-			(G_OBJECT (dialog->priv->add_lang_dialog),
-			(gpointer *) &dialog->priv->add_lang_dialog);
-		g_object_unref (dialog->priv->add_lang_dialog);
-	}
-
 	if (dialog->priv->download_dir_chooser != NULL)
 	{
 		g_object_remove_weak_pointer
@@ -628,458 +498,6 @@ create_node_combo (EphyDialog *dialog,
 	g_object_unref (sortmodel);
 }
 
-static void
-language_editor_add (PrefsDialog *pd,
-		     const char *code,
-		     const char *desc)
-{
-	GtkTreeIter iter;
-
-	g_return_if_fail (code != NULL && desc != NULL);
-
-	if (gtk_tree_model_get_iter_first (pd->priv->lang_model, &iter))
-	{
-		do
-		{
-			char *c;
-
-			gtk_tree_model_get (pd->priv->lang_model, &iter,
-					    COL_LANG_CODE, &c,
-					    -1);
-
-			if (strcmp (code, c) == 0)
-			{
-				g_free (c);
-
-				/* already in list, don't allow a duplicate */
-				return;
-			}
-			g_free (c);
-		}
-		while (gtk_tree_model_iter_next (pd->priv->lang_model, &iter));
-	}
-
-	gtk_list_store_append (GTK_LIST_STORE (pd->priv->lang_model), &iter);
-	
-	gtk_list_store_set (GTK_LIST_STORE (pd->priv->lang_model), &iter,
-			    COL_LANG_NAME, desc,
-			    COL_LANG_CODE, code,
-			    -1);
-}
-
-static void
-language_editor_update_pref (PrefsDialog *pd)
-{
-	GtkTreeIter iter;
-	GSList *codes = NULL;
-
-	if (gtk_tree_model_get_iter_first (pd->priv->lang_model, &iter))
-	{
-		do
-		{
-			char *code;
-		
-			gtk_tree_model_get (pd->priv->lang_model, &iter,
-					    COL_LANG_CODE, &code,
-					    -1);
-
-			codes = g_slist_prepend (codes, code);
-		}
-		while (gtk_tree_model_iter_next (pd->priv->lang_model, &iter));
-	}
-
-	codes = g_slist_reverse (codes);
-	eel_gconf_set_string_list (CONF_RENDERING_LANGUAGE, codes);
-
-	g_slist_foreach (codes, (GFunc) g_free, NULL);
-	g_slist_free (codes);
-}
-
-static void
-language_editor_update_buttons (PrefsDialog *dialog)
-{
-	GtkTreeSelection *selection;
-	GtkTreeModel *model;
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	int selected;
-
-	selection = gtk_tree_view_get_selection (dialog->priv->lang_treeview);
-
-	gtk_widget_set_sensitive (dialog->priv->lang_remove_button, FALSE);
-	gtk_widget_set_sensitive (dialog->priv->lang_up_button, FALSE);
-	gtk_widget_set_sensitive (dialog->priv->lang_down_button, FALSE);
-	
-	if (gtk_tree_selection_get_selected (selection, &model, &iter))
-	{
-		path = gtk_tree_model_get_path (model, &iter);
-	
-		selected = gtk_tree_path_get_indices (path)[0];
-	
-		gtk_widget_set_sensitive (dialog->priv->lang_remove_button, TRUE);
-		gtk_widget_set_sensitive (dialog->priv->lang_up_button, selected > 0);
-		gtk_widget_set_sensitive (dialog->priv->lang_down_button,
-			selected < gtk_tree_model_iter_n_children (model, NULL) - 1);
-
-		gtk_tree_path_free (path);
-	}
-}
-
-static void
-add_lang_dialog_response_cb (GtkWidget *widget,
-			     int response,
-			     PrefsDialog *pd)
-{
-	EphyDialog *dialog = pd->priv->add_lang_dialog;
-	GtkTreeView *treeview;
-	GtkTreeModel *model;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GList *rows, *r;
-
-	g_return_if_fail (dialog != NULL);
-
-	if (response == GTK_RESPONSE_OK)
-	{
-		treeview = GTK_TREE_VIEW (ephy_dialog_get_control
-				(dialog, add_lang_props[LANGUAGE_PROP].id));
-		selection = gtk_tree_view_get_selection (treeview);
-
-		rows = gtk_tree_selection_get_selected_rows (selection, &model);
-
-		for (r = rows; r != NULL; r = r->next)
-		{
-			GtkTreePath *path = (GtkTreePath *) r->data;
-
-			if (gtk_tree_model_get_iter (model, &iter, path))
-			{
-				char *code, *desc;
-				
-				gtk_tree_model_get (model, &iter,
-						    COL_LANG_NAME, &desc,
-						    COL_LANG_CODE, &code,
-						    -1);
-
-				language_editor_add (pd, code, desc);
-		
-				g_free (desc);
-				g_free (code);
-			}
-		}			
-
-		g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
-		g_list_free (rows);
-
-		language_editor_update_pref (pd);
-		language_editor_update_buttons (pd);
-	}
-
-	g_object_unref (dialog);
-}
-
-static EphyDialog *
-setup_add_language_dialog (PrefsDialog *pd)
-{
-	EphyDialog *dialog;
-	GtkWidget *window;
-	GtkListStore *store;
-	GtkTreeModel *sortmodel;
-	GtkTreeView *treeview;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	int i;
-
-	window = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[WINDOW_PROP].id);
-
-	dialog =  EPHY_DIALOG (g_object_new (EPHY_TYPE_DIALOG,
-					     "parent-window", window,
-					     NULL));
-
-	ephy_dialog_construct (dialog,  add_lang_props,
-			       "prefs-dialog.glade", "add_language_dialog");
-
-	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-
-	for (i = 0; i < n_languages; i++)
-	{
-		gtk_list_store_append (store, &iter);
-
-		gtk_list_store_set (store, &iter,
-				    COL_LANG_NAME, _(languages[i].name),
-				    COL_LANG_CODE, languages[i].code,
-				    -1);
-	}
-
-	sortmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (store));
-	gtk_tree_sortable_set_sort_column_id
-		(GTK_TREE_SORTABLE (sortmodel), COL_LANG_NAME, GTK_SORT_ASCENDING);
-
-	treeview = GTK_TREE_VIEW (ephy_dialog_get_control
-			(dialog, add_lang_props[LANGUAGE_PROP].id));
-
-	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), FALSE);
-
-	gtk_tree_view_set_model (treeview, sortmodel);
-
-	gtk_tree_view_set_headers_visible (treeview, FALSE);
-
-	renderer = gtk_cell_renderer_text_new ();
-
-	gtk_tree_view_insert_column_with_attributes (treeview,
-						     0, "Language",
-						     renderer,
-						     "text", 0,
-						     NULL);
-	column = gtk_tree_view_get_column (treeview, 0);
-	gtk_tree_view_column_set_resizable (column, TRUE);
-	gtk_tree_view_column_set_sort_column_id (column, COL_LANG_NAME);
-
-	selection = gtk_tree_view_get_selection (treeview);
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-
-	window = ephy_dialog_get_control (dialog, add_lang_props[LANGUAGE_DIALOG].id);
-	g_signal_connect (window, "response",
-			  G_CALLBACK (add_lang_dialog_response_cb), pd);
-
-	g_object_unref (store);
-	g_object_unref (sortmodel);
-
-	return dialog;
-}
-
-void
-language_editor_add_button_clicked_cb (GtkWidget *button,
-				       PrefsDialog *pd)
-{
-	if (pd->priv->add_lang_dialog == NULL)
-	{
-		pd->priv->add_lang_dialog = setup_add_language_dialog (pd);
-
-		g_object_add_weak_pointer
-			(G_OBJECT (pd->priv->add_lang_dialog),
-			(gpointer *) &pd->priv->add_lang_dialog);;
-	}
-
-	ephy_dialog_show (pd->priv->add_lang_dialog);
-}
-
-void
-language_editor_remove_button_clicked_cb (GtkWidget *button,
-					  PrefsDialog *pd)
-{
-	GtkTreeSelection *selection;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	selection = gtk_tree_view_get_selection (pd->priv->lang_treeview);
-
-	if (gtk_tree_selection_get_selected (selection, &model, &iter))
-	{
-		gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-	}
-
-	language_editor_update_pref (pd);
-	language_editor_update_buttons (pd);
-}
-
-void
-language_editor_up_button_clicked_cb (GtkWidget *button,
-				      PrefsDialog *pd)
-{
-	GtkTreeSelection *selection;
-	GtkTreeModel *model;
-	GtkTreeIter iter, iter_prev;
-	GtkTreePath *path;
-
-	selection = gtk_tree_view_get_selection (pd->priv->lang_treeview);
-
-	if (gtk_tree_selection_get_selected (selection, &model, &iter))
-	{
-		path = gtk_tree_model_get_path (model, &iter);
-
-		if (!gtk_tree_path_prev (path))
-		{
-			gtk_tree_path_free (path);
-			return;
-		}
-
-		gtk_tree_model_get_iter (model, &iter_prev, path);
-
-		gtk_list_store_swap (GTK_LIST_STORE (model), &iter_prev, &iter);
-
-		gtk_tree_path_free (path);
-	}
-
-	language_editor_update_pref (pd);
-	language_editor_update_buttons (pd);
-}
-
-void
-language_editor_down_button_clicked_cb (GtkWidget *button,
-					PrefsDialog *pd)
-{
-	GtkTreeSelection *selection;
-	GtkTreeModel *model;
-	GtkTreeIter iter, iter_next;
-	GtkTreePath *path;
-
-
-	selection = gtk_tree_view_get_selection (pd->priv->lang_treeview);
-
-	if (gtk_tree_selection_get_selected (selection, &model, &iter))
-	{
-		path = gtk_tree_model_get_path (model, &iter);
-
-		gtk_tree_path_next (path);
-
-		gtk_tree_model_get_iter (model, &iter_next, path);
-
-		gtk_list_store_swap (GTK_LIST_STORE (model), &iter, &iter_next);
-
-		gtk_tree_path_free (path);
-	}
-
-	language_editor_update_pref (pd);
-	language_editor_update_buttons (pd);
-}
-
-static void
-language_editor_treeview_drag_end_cb (GtkWidget *widget,
-				      GdkDragContext *context,
-				      PrefsDialog *dialog)
-{
-	language_editor_update_pref (dialog);
-	language_editor_update_buttons (dialog);
-}
-
-static void
-language_editor_selection_changed_cb (GtkTreeSelection *selection,
-				      PrefsDialog *dialog)
-{
-	language_editor_update_buttons (dialog);
-}
-
-static void
-create_language_section (EphyDialog *dialog)
-{
-	PrefsDialog *pd = EPHY_PREFS_DIALOG (dialog);
-	GtkListStore *store;
-	GtkTreeView *treeview;
-	GtkCellRenderer *renderer;
-	GtkTreeViewColumn *column;
-	GtkTreeSelection *selection;
-	GSList *list, *l, *ulist = NULL;
-
-	/* setup the languages treeview */
-	treeview = GTK_TREE_VIEW (ephy_dialog_get_control
-			(dialog, properties[LANGUAGE_TREEVIEW_PROP].id));
-	pd->priv->lang_treeview = treeview;
-
-	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), TRUE);
-
-	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-
-	pd->priv->lang_model = GTK_TREE_MODEL (store);
-
-	gtk_tree_view_set_model (treeview, pd->priv->lang_model);
-	g_object_unref (store);
-
-	gtk_tree_view_set_headers_visible (treeview, FALSE);
-
-	renderer = gtk_cell_renderer_text_new ();
-
-	gtk_tree_view_insert_column_with_attributes (treeview,
-						     0, "Language",
-						     renderer,
-						     "text", 0,
-						     NULL);
-	column = gtk_tree_view_get_column (treeview, 0);
-	gtk_tree_view_column_set_resizable (column, TRUE);
-	gtk_tree_view_column_set_sort_column_id (column, COL_LANG_NAME);
-
-	selection = gtk_tree_view_get_selection (treeview);
-	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
-	/* Connect treeview signals */
-	g_signal_connect (G_OBJECT (treeview), "drag_end",
-			  G_CALLBACK (language_editor_treeview_drag_end_cb), pd);
-	g_signal_connect (G_OBJECT (selection), "changed",
-			  G_CALLBACK (language_editor_selection_changed_cb), pd);
-
-	pd->priv->lang_add_button = ephy_dialog_get_control
-		(dialog, properties[LANGUAGE_ADD_BUTTON_PROP].id);
-	pd->priv->lang_remove_button = ephy_dialog_get_control
-		(dialog, properties[LANGUAGE_REMOVE_BUTTON_PROP].id);
-	pd->priv->lang_up_button = ephy_dialog_get_control
-		(dialog, properties[LANGUAGE_UP_BUTTON_PROP].id);
-	pd->priv->lang_down_button = ephy_dialog_get_control
-		(dialog, properties[LANGUAGE_DOWN_BUTTON_PROP].id);
-
-	list = eel_gconf_get_string_list (CONF_RENDERING_LANGUAGE);
-
-	/* uniquify list */
-	for (l = list; l != NULL; l = l->next)
-	{
-		if (g_slist_find_custom (ulist, l->data, (GCompareFunc) strcmp) == NULL)
-		{
-			ulist = g_slist_prepend (ulist, g_strdup (l->data));
-		}
-	}
-	ulist = g_slist_reverse (ulist);
-
-	/* if modified, write back */
-	if (g_slist_length (ulist) != g_slist_length (list))
-	{
-		eel_gconf_set_string_list (CONF_RENDERING_LANGUAGE, ulist);
-	}
-
-	/* Fill languages editor */
-	for (l = ulist; l != NULL; l = l->next)
-	{
-		const char *code = (const char *) l->data;
-		int i;
-
-		for (i = 0; i < n_languages; i++)
-		{
-			if (strcmp (languages[i].code, code) == 0) break;
-		}
-
-		/* code isn't in stock list */
-		if (i == n_languages)
-		{
-			char *text;
-
-			text = g_strdup_printf (_("Custom [%s]"), code);
-			language_editor_add (pd, code, text);
-			g_free (text);
-		}
-		else
-		{
-			language_editor_add (pd, code, _(languages[i].name));
-		}
-	}
-
-	language_editor_update_buttons (pd);
-
-	/* Lockdown if key is not writable */
-	if (eel_gconf_key_is_writable (CONF_RENDERING_LANGUAGE) == FALSE)
-	{
-		gtk_widget_set_sensitive (pd->priv->lang_add_button, FALSE);
-		gtk_widget_set_sensitive (pd->priv->lang_remove_button, FALSE);
-		gtk_widget_set_sensitive (pd->priv->lang_up_button, FALSE);
-		gtk_widget_set_sensitive (pd->priv->lang_down_button, FALSE);
-		gtk_widget_set_sensitive (GTK_WIDGET (pd->priv->lang_treeview), FALSE);
-	}
-
-	g_slist_foreach (list, (GFunc) g_free, NULL);
-	g_slist_free (list);
-
-	g_slist_foreach (ulist, (GFunc) g_free, NULL);
-	g_slist_free (ulist);
-}
-
 static char*
 get_download_button_label ()
 {
@@ -1203,8 +621,6 @@ prefs_dialog_init (PrefsDialog *pd)
 			   ephy_encodings_get_detectors (encodings),
 			   CONF_LANGUAGE_AUTODETECT_ENCODING, "");
 
-	create_language_section	(dialog);
-
 	create_download_path_label (dialog);
 }
 
