aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-12-20 02:11:10 +0800
committerChristian Persch <chpe@src.gnome.org>2004-12-20 02:11:10 +0800
commita7f9fcd9572ee1649a2af23b531dbcebd7c36538 (patch)
tree22758957cbe1670477fcb32a1cfedb59b20870aa /lib
parenta050d6bc3f0d4f73499cc7a995e154428ca08702 (diff)
downloadgsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.tar
gsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.tar.gz
gsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.tar.bz2
gsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.tar.lz
gsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.tar.xz
gsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.tar.zst
gsoc2013-epiphany-a7f9fcd9572ee1649a2af23b531dbcebd7c36538.zip
Fix a mem leak, and update copyright notice.
2004-12-19 Christian Persch <chpe@cvs.gnome.org> * lib/ephy-langs.c: (ephy_langs_append_languages), (load_iso_entries): * lib/ephy-langs.h: Fix a mem leak, and update copyright notice.
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-langs.c22
-rw-r--r--lib/ephy-langs.h2
2 files changed, 3 insertions, 21 deletions
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index 793f179ce..1dc15dd3e 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Christian Persch
+ * Copyright (C) 2003, 2004 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
@@ -143,24 +143,9 @@ void
ephy_langs_append_languages (GArray *array)
{
const char * const * languages;
- const char *system_lang;
char *lang;
int i;
- /**
- * This is a comma separated list of language ranges, as specified
- * by RFC 2616, 14.4.
- * Always include the basic language code last.
- *
- * Examples:
- * "pt" translation: "pt"
- * "pt_BR" translation: "pt-br,pt"
- * "zh_CN" translation: "zh-cn,zh"
- * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
- */
- system_lang = _("system-language");
-
- /* FIXME: use system_language when given, instead of g_get_language_names () ? */
languages = g_get_language_names ();
g_return_if_fail (languages != NULL);
@@ -286,7 +271,7 @@ typedef enum
STATE_ENTRIES,
} ParserState;
-static gboolean
+static void
load_iso_entries (int iso,
GFunc read_entry_func,
gpointer user_data)
@@ -358,14 +343,11 @@ out:
{
g_warning ("Failed to load ISO-%d codes from %s!\n",
iso, filename);
- return FALSE;
}
g_free (filename);
STOP_PROFILER ("Loading ISO codes")
-
- return TRUE;
}
GHashTable *
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index 01d1231f1..24b31a0c7 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000, 2003 Marco Pesenti Gritti
- * Copyright (C) 2003 Christian Persch
+ * Copyright (C) 2003, 2004 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