4 files changed, 5 insertions, 101 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 0440770b53..731e4c3227 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-30  Not Zed  <NotZed@Ximian.com>
+
+	* e-lang-utils.[ch]: Removed.  This is covered by
+	gnome_i18n_get_language_list, which is more complete.
+
 2004-04-30  Dan Winship  <danw@ximian.com>
 
 	* e-icon-factory.c (load_icon): Make this work for non-stock icons
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 70af472abc..54fd0affa6 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -29,7 +29,6 @@ eutilinclude_HEADERS = 				\
 	e-html-utils.h				\
 	e-icon-factory.h			\
 	e-iterator.h				\
-	e-lang-utils.h				\
 	e-list-iterator.h			\
 	e-list.h				\
 	e-memory.h				\
@@ -68,7 +67,6 @@ libeutil_la_SOURCES =				\
 	e-html-utils.c				\
 	e-icon-factory.c			\
 	e-iterator.c				\
-	e-lang-utils.c				\
 	e-list-iterator.c			\
 	e-list.c				\
 	e-memory.c				\
diff --git a/e-util/e-lang-utils.c b/e-util/e-lang-utils.c
deleted file mode 100644
index 564b4a353d..0000000000
--- a/e-util/e-lang-utils.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-lang-utils.c - Utility functions for multi-language support.
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-lang-utils.h"
-
-#include <string.h>
-
-
-GSList *
-e_get_language_list (void)
-{
-	GSList *list = NULL;
-	const char *env;
-	const char *p;
-
-	env = g_getenv ("LANGUAGE");
-	if (env == NULL) {
-		env = g_getenv ("LANG");
-		if (env == NULL)
-			return NULL;
-	}
-
-	p = strchr (env, '=');
-	if (p != NULL)
-		env = p;
-
-	list = g_slist_prepend (list, g_strdup (env));
-
-	p = strchr (env, '_');
-	if (p != NULL)
-		list = g_slist_prepend (list, g_strndup (env, p - env));
-
-	return list;
-}
-
-void
-e_free_language_list (GSList *list)
-{
-	GSList *iter;
-
-	for (iter = list; iter; iter = iter->next)
-		g_free (iter->data);
-
-	g_slist_free (list);
-}
diff --git a/e-util/e-lang-utils.h b/e-util/e-lang-utils.h
deleted file mode 100644
index 135d98db7a..0000000000
--- a/e-util/e-lang-utils.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-lang-utils.h - Utility functions for multi-language support.
- *
- * Copyright (C) 2002 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef E_LANG_UTILS_H
-#define E_LANG_UTILS_H
-
-#include <glib.h>
-
-GSList *e_get_language_list (void);
-void e_free_language_list (GSList *list);
-
-#endif /* E_LANG_UTILS_H */