Make sure translations works in an UTF8 environment.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@124 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/tx/TXWindow.cxx b/tx/TXWindow.cxx
index a649de40a7bbf6a7203fef506a97b1434d0d68b6..1114685c22576aca1d420862e1681a3f086210cb 100644 (file)
--- a/tx/TXWindow.cxx
+++ b/tx/TXWindow.cxx
@@ -73,7 +73,7 @@ void TXWindow::init(Display* dpy, const char* defaultWindowClass_)
   white = enabledBg = cols[5].pixel;
   defaultGC = XCreateGC(dpy, DefaultRootWindow(dpy), 0, 0);
   defaultFS
-    = XLoadQueryFont(dpy, "-*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*");
+    = XLoadQueryFont(dpy, "-*-helvetica-medium-r-*-*-12-*-*-*-*-*-iso8859-*");
   if (!defaultFS) {
     defaultFS = XLoadQueryFont(dpy, "fixed");
     if (!defaultFS) {

diff --git a/vncviewer_unix/vncviewer.cxx b/vncviewer_unix/vncviewer.cxx
index e8e14b1c08ae6f3d3bbb6d291a3eeffb8c64bd29..7954647cfb47df1f0e114372372e1c43ca87d7c9 100644 (file)
--- a/vncviewer_unix/vncviewer.cxx
+++ b/vncviewer_unix/vncviewer.cxx
@@ -194,6 +194,8 @@ int main(int argc, char** argv)
             buildtime);
   fprintf(stderr,"\n%s\n", aboutText);
 
+  bind_textdomain_codeset(PACKAGE, "iso-8859-1");
+
   rfb::initStdIOLoggers();
   rfb::LogWriter::setLogParams("*:stderr:30");