aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--TODO7
-rw-r--r--configure.ac6
-rw-r--r--src/languages.h25
4 files changed, 16 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b037b617..0eb2eb5fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-09-03 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+
+ Depend on pygtk 2.8. Fixes bug #314557.
+
+ * src/languages.h:
+
+ Remove duplicate entries.
+
2005-09-01 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-toolbar-editor.c: (ephy_toolbar_editor_constructor):
diff --git a/TODO b/TODO
index fddc6a6e3..09047eed8 100644
--- a/TODO
+++ b/TODO
@@ -11,12 +11,11 @@ Stuff to port to new glib/gtk+ APIs:
- port Downloads directory button in prefs to GtkFileChooserButton
(but wait for bugs #154388, #154390, #154392, #154394)
- port to confirm-overwrite signal of GtkFileChooser
+- use GtkStatusIcon instead of EggStatusIcon
+- use g_intern_static_string for static type name registrations
+ and g_object_set_data
Stuff to do when dropping support for mozilla < 1.7:
- use dependent strings
- use gtk_moz_embed_set_app_components
-================
-
-- Rename "Unicode" to "Other languages/scripts" in Fonts prefs.
-
diff --git a/configure.ac b/configure.ac
index d9b4e6eb8..991c025fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,8 +210,8 @@ AC_MSG_RESULT([$gecko])
case "$gecko" in
mozilla) min_version=1.7.9 flavour=mozilla ;;
seamonkey) min_version=1.0 flavour=mozilla ;;
-*firefox) min_version=1.0.5 flavour=toolkit ;;
-*thunderbird) min_version=1.0.5 flavour=toolkit ;;
+*firefox) min_version=1.0 flavour=toolkit ;;
+*thunderbird) min_version=1.0 flavour=toolkit ;;
esac
MOZILLA=$gecko
@@ -581,7 +581,7 @@ EOF
fi
if test "x$have_python" != "xno"; then
- PYGTK_REQUIRED=2.6.0
+ PYGTK_REQUIRED=2.7.1
GNOME_PYTHON_REQUIRED=2.6.0
PKG_CHECK_MODULES([PYGTK], [pygtk-2.0 >= $PYGTK_REQUIRED gnome-python-2.0 >= $GNOME_PYTHON_REQUIRED],
diff --git a/src/languages.h b/src/languages.h
index 063940622..d1c17b851 100644
--- a/src/languages.h
+++ b/src/languages.h
@@ -4,14 +4,12 @@ static const char languages[][7] =
* http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany
*/
"ab",
-"ab",
"af",
"af-na",
"af-za",
"am",
"an",
"ar",
-"ar",
"ar-ae",
"ar-bh",
"ar-dj",
@@ -45,13 +43,11 @@ static const char languages[][7] =
"ay-bo",
"ay-pe",
"az",
-"az",
"az-az",
"az-ge",
"az-ir",
"az-tr",
"bal",
-"bal",
"bal-af",
"bal-ir",
"bal-om",
@@ -66,7 +62,6 @@ static const char languages[][7] =
"bo-in",
"bo-np",
"bs",
-"bs",
"bs-cs",
"bs-hr",
"ca",
@@ -87,7 +82,6 @@ static const char languages[][7] =
"da-dk",
"da-gl",
"de",
-"de",
"de-at",
"de-be",
"de-ch",
@@ -215,7 +209,6 @@ static const char languages[][7] =
"fj",
"fo",
"fr",
-"fr",
"fr-be",
"fr-bf",
"fr-bi",
@@ -263,11 +256,9 @@ static const char languages[][7] =
"fy-de",
"fy-nl",
"ga",
-"ga",
"gd",
"gl",
"gn",
-"gn",
"gn-ar",
"gn-bo",
"gu",
@@ -283,16 +274,13 @@ static const char languages[][7] =
"hi-in",
"ho",
"hr",
-"hr",
"hr-ba",
"hr-hr",
"ht",
"hu",
-"hu",
"hu-cs",
"hu-si",
"hy",
-"hy",
"ia",
"hy-az",
"hy-ge",
@@ -301,7 +289,6 @@ static const char languages[][7] =
"ie",
"is",
"it",
-"it",
"it-ch",
"it-hr",
"it-it",
@@ -328,18 +315,15 @@ static const char languages[][7] =
"ko-kr",
"ks",
"ku",
-"ku",
"ku-iq",
"ku-ir",
"ku-tr",
"kw",
"ky",
-"ky",
"la",
"lb",
"li",
"ln",
-"ln",
"lo",
"lt",
"lv",
@@ -392,7 +376,6 @@ static const char languages[][7] =
"nr",
"nso",
"ny",
-"ny",
"ny-mz",
"ny-zm",
"oc",
@@ -428,8 +411,6 @@ static const char languages[][7] =
"rm",
"rn",
"ro",
-"ro",
-"ru",
"ru",
"ru-by",
"ru-ge",
@@ -447,13 +428,11 @@ static const char languages[][7] =
"sg",
"si",
"sk",
-"sk",
"sl",
"sm",
"sm-as",
"sm-ws",
"so",
-"so",
"so-dj",
"so-et",
"so-ke",
@@ -467,7 +446,6 @@ static const char languages[][7] =
"sq-cs",
"sq-mk",
"sr",
-"sr",
"sr-ba",
"sr-cs",
"ss",
@@ -498,7 +476,6 @@ static const char languages[][7] =
"ti-et",
"tig",
"tk",
-"tk",
"tk-af",
"tk-ir",
"tkl",
@@ -519,12 +496,10 @@ static const char languages[][7] =
"ts",
"tvl",
"uk",
-"uk",
"ur",
"ur-in",
"ur-pk",
"uz",
-"uz",
"ve",
"vi",
"vo",