[gtranslator] Fix search path for help dir.
- From: Jordi Mallach <jordim src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtranslator] Fix search path for help dir.
- Date: Thu, 21 Jul 2011 15:04:26 +0000 (UTC)
commit c7384bfd19fff70bc83ff452923029da176c00b8
Author: Jordi Mallach <jordi sindominio net>
Date: Thu Jul 21 17:01:19 2011 +0200
Fix search path for help dir.
Define a gtr_dirs_get_gtr_help_dir() method and use it to build the correct
path to the manual.
src/gtr-dirs.c | 13 +++++++++++++
src/gtr-dirs.h | 2 ++
src/gtr-utils.c | 4 ++--
3 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/src/gtr-dirs.c b/src/gtr-dirs.c
index 72e1171..b819f3f 100644
--- a/src/gtr-dirs.c
+++ b/src/gtr-dirs.c
@@ -34,6 +34,7 @@ static gchar *user_config_dir = NULL;
static gchar *user_cache_dir = NULL;
static gchar *user_plugins_dir = NULL;
static gchar *gtr_data_dir = NULL;
+static gchar *gtr_help_dir = NULL;
static gchar *gtr_locale_dir = NULL;
static gchar *gtr_lib_dir = NULL;
static gchar *gtr_plugins_dir = NULL;
@@ -49,6 +50,8 @@ gtr_dirs_init ()
win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
gtr_data_dir = g_build_filename (win32_dir, "share", "gtranslator", NULL);
+ gtr_help_dir = g_build_filename (win32_dir,
+ "share", "gtranslator", "help", NULL);
gtr_locale_dir = g_build_filename (win32_dir, "share", "locale", NULL);
gtr_lib_dir = g_build_filename (win32_dir, "lib", "gtranslator", NULL);
@@ -64,6 +67,8 @@ gtr_dirs_init ()
ige_mac_bundle_get_resourcesdir (bundle);
gtr_data_dir = g_build_filename (bundle_data_dir, "gtranslator", NULL);
+ gtr_help_dir = g_build_filename (bundle_data_dir,
+ "gtranslator", "help" NULL);
gtr_locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle));
gtr_lib_dir = g_build_filename (bundle_resource_dir,
"lib", "gtranslator", NULL);
@@ -72,6 +77,7 @@ gtr_dirs_init ()
if (gtr_data_dir == NULL)
{
gtr_data_dir = g_build_filename (DATADIR, "gtranslator", NULL);
+ gtr_help_dir = g_build_filename (DATADIR, "gnome", "help", NULL);
gtr_locale_dir = g_build_filename (DATADIR, "locale", NULL);
gtr_lib_dir = g_build_filename (LIBDIR, "gtranslator", NULL);
}
@@ -95,6 +101,7 @@ gtr_dirs_shutdown ()
g_free (user_cache_dir);
g_free (user_plugins_dir);
g_free (gtr_data_dir);
+ g_free (gtr_help_dir);
g_free (gtr_locale_dir);
g_free (gtr_lib_dir);
g_free (gtr_plugins_dir);
@@ -127,6 +134,12 @@ gtr_dirs_get_gtr_data_dir (void)
}
const gchar *
+gtr_dirs_get_gtr_help_dir (void)
+{
+ return gtr_help_dir;
+}
+
+const gchar *
gtr_dirs_get_gtr_locale_dir (void)
{
return gtr_locale_dir;
diff --git a/src/gtr-dirs.h b/src/gtr-dirs.h
index db44bc7..7a69ad4 100644
--- a/src/gtr-dirs.h
+++ b/src/gtr-dirs.h
@@ -41,6 +41,8 @@ const gchar *gtr_dirs_get_user_plugins_dir (void);
const gchar *gtr_dirs_get_gtr_data_dir (void);
+const gchar *gtr_dirs_get_gtr_help_dir (void);
+
const gchar *gtr_dirs_get_gtr_locale_dir (void);
const gchar *gtr_dirs_get_gtr_lib_dir (void);
diff --git a/src/gtr-utils.c b/src/gtr-utils.c
index bbfcb2d..65cf9c5 100644
--- a/src/gtr-utils.c
+++ b/src/gtr-utils.c
@@ -731,8 +731,8 @@ gtr_utils_help_display (GtkWindow * parent,
if (strchr (lang, '.'))
continue;
- path = gtr_dirs_get_gtr_data_dir ();
- uri = g_build_filename (path, "gnome", "help", doc_id,
+ path = gtr_dirs_get_gtr_help_dir ();
+ uri = g_build_filename (path, doc_id,
lang, file_name, NULL);
if (g_file_test (uri, G_FILE_TEST_EXISTS))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]