From 107d32b49fc319e878ed763a0c4d336439061e24 Mon Sep 17 00:00:00 2001 From: John Spray Date: Sun, 26 Mar 2006 10:18:52 +0000 Subject: [PATCH] Revert patch from bug 1954, to fix bug 2421 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13498 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/gtk/ChangeLog | 3 +++ src/frontends/gtk/GMenubar.C | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog index 3cf01d0a62..ffcc29ed07 100644 --- a/src/frontends/gtk/ChangeLog +++ b/src/frontends/gtk/ChangeLog @@ -1,3 +1,6 @@ +2006-03-26 John Spray + * GMenubar.C: expect menu strings to be locale encoded (bug 2421,1954) + 2006-03-10 Martin Vermeer * GChanges.C: fix bug 2212: First change is skipped in diff --git a/src/frontends/gtk/GMenubar.C b/src/frontends/gtk/GMenubar.C index 04785b007a..8269123f15 100644 --- a/src/frontends/gtk/GMenubar.C +++ b/src/frontends/gtk/GMenubar.C @@ -52,15 +52,15 @@ private: }; -// ENCODING: assume that the backend will give us a ISO-8859-1 string +// ENCODING: assume that the backend will give us a locale string Glib::ustring labelTrans(string const & label_src, string const & shortcut) { string label = subst(label_src, "_", "__"); string::size_type i = label.find(shortcut); if (i == string::npos) - return Glib::convert(label, "UTF-8", "ISO-8859-1"); + return Glib::locale_to_utf8 (label); label.insert(i, "_"); - return Glib::convert(label, "UTF-8", "ISO-8859-1"); + return Glib::locale_to_utf8 (label); } -- 2.39.5