From bf0e0b42ce9209f92f53604cb7799540b3eea7fa Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Tue, 25 May 2010 15:44:01 +0000
Subject: Remove some code duplication

---
(limited to 'shell')

diff --git a/shell/Makefile.am b/shell/Makefile.am
index af105eb..f4da681 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -14,7 +14,6 @@ INCLUDES=							\
 	-I$(top_builddir)/libview				\
 	-I$(top_srcdir)/libmisc					\
 	-I$(top_srcdir)/properties				\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
 	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
diff --git a/shell/main.c b/shell/main.c
index 4ed0b05..8d057a0 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -232,33 +232,6 @@ load_files (const char **files)
         }
 }
 
-static gchar*
-ev_get_locale_dir ()
-{
-#ifdef G_OS_WIN32
-	gchar *install_dir = NULL, *locale_dir;
-	gchar *retval = NULL;
-
-	install_dir =
-	    g_win32_get_package_installation_directory_of_module (NULL);
-
-	if (install_dir) {
-		locale_dir = g_build_filename (install_dir,
-					"share", "locale", NULL);
-		retval = g_win32_locale_filename_from_utf8 (locale_dir);
-		g_free (install_dir);
-		g_free (locale_dir);
-	}
-
-	if (retval)
-		return retval;
-	else
-		return g_strdup ("");
-#else
-	return g_strdup (GNOMELOCALEDIR);
-#endif
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -296,9 +269,7 @@ main (int argc, char *argv[])
 
 #ifdef ENABLE_NLS
 	/* Initialize the i18n stuff */
-	gchar *tmp = ev_get_locale_dir ();
-	bindtextdomain (GETTEXT_PACKAGE, tmp);
-	g_free (tmp);
+	bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir());
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 #endif
--
cgit v0.9.1