From 74a65ebd93be6eb40eb5a9b44e1ef06e784c6a20 Mon Sep 17 00:00:00 2001 From: handa Date: Fri, 23 Jun 2006 02:44:55 +0000 Subject: [PATCH] (show_cursor): Call mlanguage_name to get English name of language. (compare_input_method): Likewise. (main): Likewise. --- example/medit.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/example/medit.c b/example/medit.c index 30a7e3b..b32052c 100644 --- a/example/medit.c +++ b/example/medit.c @@ -865,8 +865,7 @@ show_cursor (XtPointer client_data) else { XtSetArg (arg[0], XtNborderWidth, 1); - XtSetArg (arg[1], XtNlabel, - msymbol_name (msymbol_get (sym, Mlanguage))); + XtSetArg (arg[1], XtNlabel, mlanguage_name (sym)); XtSetValues (CurLangWidget, arg, 2); } XtSetValues (CurLangWidget, arg, 2); @@ -2247,8 +2246,8 @@ compare_input_method (const void *elt1, const void *elt2) return 1; if (im2->language == Mt) return -1; - lang1 = msymbol_get (im1->language, Mlanguage); - lang2 = msymbol_get (im2->language, Mlanguage); + lang1 = mlanguage_name (im1->language); + lang2 = mlanguage_name (im2->language); return strcmp (msymbol_name (lang1), msymbol_name (lang2)); } @@ -2963,7 +2962,7 @@ main (int argc, char **argv) if (im->language != Mnil && im->language != Mt) { - MSymbol sym = msymbol_get (im->language, Mlanguage); + MSymbol sym = mlanguage_name (im->language); if (sym == Mnil) name1 = msymbol_name (im->language); else @@ -3090,7 +3089,7 @@ main (int argc, char **argv) MSymbol fullname; if (sym != Mnil - && ((fullname = msymbol_get (sym, Mlanguage)) != Mnil)) + && ((fullname = mlanguage_name (sym)) != Mnil)) { char *name = msymbol_name (fullname); char c = name[0]; -- 1.7.10.4