diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 23:14:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 23:14:00 +0000 |
| commit | 2a2b48ef66916f3ac7aafb46b83e1e86a6e15cf8 (patch) | |
| tree | b6823d2558fc70c421e3d33e4457f873a094a3e4 /libs | |
| parent | c09dc77dfc3a5f0cd6d35b72388a9222e2f2faf3 (diff) | |
start passing around the (possibly-bundle-modified) localedir so that we call bindtextdomain() correctly, and thus (hopefully) find message catalogs correctly inside a bundle
git-svn-id: svn://localhost/ardour2/branches/3.0@13965 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/ardour.h | 2 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 4 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/utils.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/utils.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 03de3965ec..26e875fda3 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -50,7 +50,7 @@ namespace ARDOUR { extern PBD::Signal1<void,std::string> BootMessage; extern PBD::Signal0<void> GUIIdle; - int init (bool with_vst, bool try_optimization); + int init (bool with_vst, bool try_optimization, const char* localedir); void init_post_engine (); int cleanup (); bool no_auto_connect (); diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 613ecbfc7d..e750792c5f 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -215,7 +215,7 @@ lotsa_files_please () } int -ARDOUR::init (bool use_windows_vst, bool try_optimization) +ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir) { if (!Glib::thread_supported()) { Glib::thread_init(); @@ -224,7 +224,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization) // this really should be in PBD::init..if there was one Gio::init (); - (void) bindtextdomain(PACKAGE, LOCALEDIR); + (void) bindtextdomain(PACKAGE, localedir); PBD::ID::init (); SessionEvent::init_event_pool (); diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h index 242e1c77d0..0bde3cb562 100644 --- a/libs/gtkmm2ext/gtkmm2ext/utils.h +++ b/libs/gtkmm2ext/gtkmm2ext/utils.h @@ -45,7 +45,7 @@ namespace Gtk { } namespace Gtkmm2ext { - void init (); + void init (const char*); std::string fit_to_pixels (const std::string&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false); std::pair<std::string, double> fit_to_pixels (cairo_t *, std::string, double); diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 83ad4537a2..14f3ba2732 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -37,10 +37,10 @@ using namespace std; void -Gtkmm2ext::init () +Gtkmm2ext::init (const char* localedir) { // Necessary for gettext - (void) bindtextdomain(PACKAGE, LOCALEDIR); + (void) bindtextdomain(PACKAGE, localedir); } void |