diff options
-rw-r--r-- | pluma/Makefile.am | 1 | ||||
-rw-r--r-- | pluma/pluma-dirs.c | 5 | ||||
-rw-r--r-- | pluma/pluma-dirs.h | 2 | ||||
-rw-r--r-- | pluma/pluma.c | 5 |
4 files changed, 2 insertions, 11 deletions
diff --git a/pluma/Makefile.am b/pluma/Makefile.am index 36d93c6a..ef30f56e 100644 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -14,6 +14,7 @@ AM_CPPFLAGS = \ $(INTROSPECTION_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DPLUMA_DATADIR=\""$(datadir)/pluma"\" \ + -DPLUMA_LOCALEDIR=\""$(datadir)/locale/"\" \ -DLIBDIR=\""$(libdir)"\" pluma_SOURCES = \ diff --git a/pluma/pluma-dirs.c b/pluma/pluma-dirs.c index 161675a9..53f183d5 100644 --- a/pluma/pluma-dirs.c +++ b/pluma/pluma-dirs.c @@ -66,8 +66,3 @@ gchar* pluma_dirs_get_user_accels_file(void) return accels; } - -gchar* pluma_dirs_get_pluma_locale_dir(void) -{ - return g_build_filename(DATADIR, "locale", NULL); -} diff --git a/pluma/pluma-dirs.h b/pluma/pluma-dirs.h index 7d30b6c7..b700747e 100644 --- a/pluma/pluma-dirs.h +++ b/pluma/pluma-dirs.h @@ -36,8 +36,6 @@ gchar *pluma_dirs_get_user_plugins_dir (void); gchar *pluma_dirs_get_user_accels_file (void); -gchar *pluma_dirs_get_pluma_locale_dir (void); - G_END_DECLS #endif /* __PLUMA_DIRS_H__ */ diff --git a/pluma/pluma.c b/pluma/pluma.c index 0d51f90e..2eeaed48 100644 --- a/pluma/pluma.c +++ b/pluma/pluma.c @@ -506,7 +506,6 @@ main (int argc, char *argv[]) PlumaApp *app; gboolean restored = FALSE; GError *error = NULL; - gchar *dir; /* Setup debugging */ pluma_debug_init (); @@ -514,9 +513,7 @@ main (int argc, char *argv[]) setlocale (LC_ALL, ""); - dir = pluma_dirs_get_pluma_locale_dir (); - bindtextdomain (GETTEXT_PACKAGE, dir); - g_free (dir); + bindtextdomain (GETTEXT_PACKAGE, PLUMA_LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); |