[git] GPA - branch, master, updated. gpa-0.9.10-7-g2dae64a

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".

The branch, master has been updated
       via  2dae64a65080c52a731d98a905a447de1428cc7c (commit)
      from  0a78795146661234070681737b3e08228616441f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2dae64a65080c52a731d98a905a447de1428cc7c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Apr 13 09:44:47 2017 +0200

    w32: Make location of locale dir more flexible
    
    * src/gpa.c (get_locale_dir): If installed under a bin subdirectory
    strip this out of the locale path.
    
    --
    This fixes loading locales when GPA is installed under a bin
    subdirectory like it is with GnuPG 2.1 and Gpg4win.

diff --git a/src/gpa.c b/src/gpa.c
index be8490d..bad001f 100644
--- a/src/gpa.c
+++ b/src/gpa.c
@@ -160,7 +160,15 @@ get_locale_dir (void)
 
   if (! GetModuleFileNameA (0, name, sizeof (name) - 30))
     return NULL;
-  p = strrchr (name, '\\');
+
+  /* If installed under bin assume that share is on the same
+     hierarchy as the bin subdirectory. Otherwise assume that
+     share is a subdirectory of the gpa.exe location. */
+  p = strstr (name, "\\bin\\");
+  if (!p)
+    {
+      p = strrchr (name, '\\');
+    }
   if (!p)
     {
       *name = '\\';

-----------------------------------------------------------------------

Summary of changes:
 src/gpa.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org