diff options
| author | Hib Eris <hib@hiberis.nl> | 2010-05-25 15:44:01 (GMT) |
|---|---|---|
| committer | Hib Eris <hib@hiberis.nl> | 2010-05-25 15:48:06 (GMT) |
| commit | bf0e0b42ce9209f92f53604cb7799540b3eea7fa (patch) | |
| tree | 593c45cb4a0c8ccc1c0122212b150b535aba2977 /previewer | |
| parent | 61c9b15fa57e40c9561ae8d5ca13228d4e7a897a (diff) | |
Remove some code duplication
Diffstat (limited to 'previewer')
| -rw-r--r-- | previewer/Makefile.am | 1 | ||||
| -rw-r--r-- | previewer/ev-previewer.c | 31 |
2 files changed, 1 insertions, 31 deletions
diff --git a/previewer/Makefile.am b/previewer/Makefile.am index ea5296e..da0706c 100644 --- a/previewer/Makefile.am +++ b/previewer/Makefile.am @@ -13,7 +13,6 @@ evince_previewer_CPPFLAGS = \ -I$(top_srcdir)/libdocument \ -I$(top_srcdir)/libview \ -I$(top_srcdir)/libmisc \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ $(AM_CPPFLAGS) evince_previewer_CFLAGS = \ diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c index 14d4f2f..2b8dea3 100644 --- a/previewer/ev-previewer.c +++ b/previewer/ev-previewer.c @@ -100,33 +100,6 @@ ev_previewer_load_document (const gchar *filename, g_free (uri); } -static gchar* -ev_previewer_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 -} - gint main (gint argc, gchar **argv) { @@ -166,9 +139,7 @@ main (gint argc, gchar **argv) #ifdef ENABLE_NLS /* Initialize the i18n stuff */ - gchar *tmp = ev_previewer_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 |