Remove unused fonts languages and autodetectors stuff. Bug #558407.

svn path=/trunk/; revision=8731

5 files changed, 1 insertions, 180 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 38981eb88..ec74a1e56 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,3 @@
-
 SUBDIRS = art glade icons ui
 
 @INTLTOOL_SERVER_RULE@
diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in
index 9fbc69d9a..150ccb2fb 100644
--- a/data/epiphany.pc.in
+++ b/data/epiphany.pc.in
@@ -8,7 +8,6 @@ datarootdir=@datarootdir@
 datadir=@datadir@
 icondir=@datadir@/@PACKAGE@/icons
 features=@EPIPHANY_FEATURES@
-engine=@with_engine@
 
 Name: Epiphany Browser
 Description: GNOME Web Browser
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 51bcb107e..81fadca59 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -390,27 +390,6 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/epiphany/web/autodetect_encoding</key>
-        <applyto>/apps/epiphany/web/autodetect_encoding</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <locale name="C">
-        <default></default>
-	<short>The encoding autodetector. Empty string means autodetect is off</short>
-	<long>
-	The encoding autodetector. Valid entries are "" (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),
-	"zhtw_parallel_state_machine" (autodetect traditional chinese encodings)
-	and "universal_charset_detector" (autodetect most encodings).
-	</long>
-        </locale>
-      </schema>
-      <schema>
         <key>/schemas/apps/epiphany/web/cookie_accept</key>
         <applyto>/apps/epiphany/web/cookie_accept</applyto>
         <owner>epiphany</owner>
diff --git a/data/generate-font-schemas.py b/data/generate-font-schemas.py
deleted file mode 100755
index 5c1570694..000000000
--- a/data/generate-font-schemas.py
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: UTF-8 -*-
-#
-#  Copyright © 2005 Christian Persch
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-#  $Id$
-
-import sys, codecs
-from xml import dom;
-
-sys.stdout = codecs.getwriter("utf-8")(sys.__stdout__)
-
-def appendTextNode(doc, schemaNode, tag, text):
-	node = doc.createElement(tag)
-	schemaNode.appendChild(node)
-	textNode = doc.createTextNode(text)
-	node.appendChild(textNode)
-
-
-def appendLocaleNode(doc, schemaNode, localeName, shortSchemaText):
-	localeNode = doc.createElement("locale")
-	localeNode.setAttribute("name", localeName)
-	schemaNode.appendChild(localeNode)
-
-	appendTextNode(doc, localeNode, "short", shortSchemaText)
-	appendTextNode(doc, localeNode, "long", shortSchemaText)
-
-
-def append_schema(doc, schemalistNode, key, datatype, default, description, schemaText):
-	schemaNode = doc.createElement("schema")
-	schemalistNode.appendChild(schemaNode)
-	appendTextNode (doc, schemaNode, "key", "/schemas" + key)
-	appendTextNode (doc, schemaNode, "applyto", key)
-	appendTextNode (doc, schemaNode, "owner", "epiphany")
-	appendTextNode (doc, schemaNode, "type", datatype)
-	appendTextNode (doc, schemaNode, "default", default)
-	appendLocaleNode (doc, schemaNode, "C", schemaText)
-
-
-def append_schemas(docNode, schemalistNode, group):
-	base = "/apps/epiphany/web/"
-	append_schema(doc, schemalistNode, base + "fixed_font_size_" + group,
-		      "int", "12", "Monospace font size",
-		      "Monospaced font size for \"" + group + "\"")
-	append_schema(doc, schemalistNode, base + "font_monospace_" + group,
-		      "string", "monospace", "Monospace font",
-		      "Monospaced font for \"" + group + "\"")
-	append_schema(doc, schemalistNode, base + "variable_font_size_" + group,
-		      "int", "12", "Proportional font size",
-		      "Variable width font size for \"" + group + "\"")
-	append_schema(doc, schemalistNode, base + "font_variable_" + group,
-		      "string", "sans-serif", "Proportional font",
-		      "Variable width font for \"" + group + "\"")
-	append_schema(doc, schemalistNode, base + "minimum_font_size_" + group,
-		      "int", "7", "Minimum font size",
-		      "Minimum font size for \"" + group + "\"")
-
-
-# keep this list in sync with lib/ephy-langs.c
-font_languages = [
-	"ar",
-	"el",
-	"he",
-	"ja",
-	"ko",
-	"th",
-	"tr",
-	"x-armn",
-	"x-baltic",
-	"x-beng",
-	"x-cans",
-	"x-central-euro",
-	"x-cyrillic",
-	"x-devanagari",
-	"x-ethi",
-	"x-geor",
-	"x-gujr",
-	"x-guru",
-	"x-khmr",
-	"x-mlym",
-	"x-tamil",
-	"x-unicode",
-	"x-western",
-	"zh-CN",
-	"zh-HK",
-	"zh-TW" ]
-
-doc = dom.getDOMImplementation().createDocument(None, "gconfschemafile", None)
-
-schemalistNode = doc.createElement("schemalist")
-doc.documentElement.appendChild(schemalistNode)
-
-for lang in font_languages:
-	append_schemas(doc, schemalistNode, lang)
-
-doc.writexml(sys.stdout)
-
-# Remember to pass the output through "xmllint --format"
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index 1b9fce8a7..95890b4eb 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -1324,7 +1324,7 @@
 		      <child>
 			<widget class="GtkTable" id="table72">
 			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
+			  <property name="n_rows">1</property>
 			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
 			  <property name="row_spacing">6</property>
@@ -1360,35 +1360,6 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkLabel" id="auto_encoding_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Au_todetect:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">auto_encoding_combo</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
 			    <widget class="GtkComboBox" id="default_encoding_combo">
 			      <property name="visible">True</property>
 			      <property name="add_tearoffs">False</property>
@@ -1402,21 +1373,6 @@
 			      <property name="y_options">fill</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="auto_encoding_combo">
-			      <property name="visible">True</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">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>
 		      </child>
 		    </widget>