String object for Greek locale testing should have been Glib::ustring, rather than...
authorJohn Emmas <johne53@tiscali.co.uk>
Fri, 21 Mar 2014 16:00:44 +0000 (16:00 +0000)
committerJohn Emmas <johne53@tiscali.co.uk>
Fri, 21 Mar 2014 16:02:46 +0000 (16:02 +0000)
(see my previous commit)

gtk2_ardour/bundle_env_msvc.cc

index 8a7fcc0d7da29c1b1ca269f3637538068b9ed352..d2c85b79353f2d29e1d411b8390b7fe78e138a0a 100644 (file)
@@ -252,10 +252,13 @@ string pango_modules_file;
                pango_modules_file += "\\";
                pango_modules_file += PROGRAM_NAME;
                pango_modules_file += PANGO_CONF_LOCATION;
-/* JE - handy for non-English locale testing (Greek, in this case)
-pango_modules_file = Glib::locale_to_utf8("C:\\Program Files\\Mixbus3\\etc\\��������\\pango.modules");
+#if 0
+// JE - handy for non-English locale testing (Greek, in this case)
+               Glib::ustring pango_modules_path = Glib::locale_to_utf8("C:\\Program Files\\Mixbus3\\etc\\��������\\pango.modules");
 /**/
+#else
                Glib::ustring pango_modules_path = pango_modules_file;
+#endif
                pango_modules_path.resize (pango_modules_path.size()-14); // Remove "/pango.modules" from the end
 #else
        if (PBD::find_file_in_search_path (ARDOUR::ardour_config_search_path(), "pango.modules", pango_modules_file)) {