fix bug 2089: Touching Navigate menu crashes Lyx when a TOC inset is in a section...

[lyx.git] / src / client / messages.C

diff --git a/src/client/messages.C b/src/client/messages.C
index d1aa3f52217c77a1bf95f0b17ca5c69bf9dd223e..c1b0f8bae3f36db0b8f13d09693edb110cc06756 100644 (file)
--- a/src/client/messages.C
+++ b/src/client/messages.C
@@ -11,11 +11,9 @@
 
 #include "messages.h"
 #include "support/filetools.h"
-#include "support/path_defines.h"
-
-using lyx::support::GetEnvPath;
-using lyx::support::lyx_localedir;
+#include "support/package.h"
 
+using lyx::support::package;
 using std::string;
 
 
@@ -40,7 +38,8 @@ public:
                //lyxerr << "Messages: language(" << l
                //       << ") in dir(" << dir << ")" << std::endl;
 
-               cat_gl = mssg_gl.open(PACKAGE, loc_gl, lyx_localedir().c_str());
+               cat_gl = mssg_gl.open(PACKAGE, loc_gl,
+                                     package().locale_dir().c_str());
 
        }
 
@@ -95,7 +94,7 @@ public:
 
                char * old = strdup(setlocale(LC_ALL, 0));
                char * n = setlocale(LC_ALL, lang_.c_str());
-               bindtextdomain(PACKAGE, lyx_localedir().c_str());
+               bindtextdomain(PACKAGE, package().locale_dir().c_str());
                textdomain(PACKAGE);
                const char* msg = gettext(m.c_str());
                setlocale(LC_ALL, old);