From 211f2210f26e23d5b0ccc7113273c5ea04ae49d2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 18 Mar 2005 04:21:17 +0000 Subject: [PATCH] (x_update_menu_appearance) [HAVE_X_I18N]: Use xic_create_fontsetname even for non-Motif menus. Don't forget to free the fontsetname. --- src/ChangeLog | 8 ++++++++ src/xfaces.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3c45a623c31..83c4401be27 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-03-17 Stefan Monnier + + * xfaces.c (x_update_menu_appearance) [HAVE_X_I18N]: + Use xic_create_fontsetname even for non-Motif menus. + Don't forget to free the fontsetname. + + * xfns.c (xic_create_fontsetname): Add a final catch-all font pattern. + 2005-03-17 Richard M. Stallman * dispnew.c (mirror_line_dance): Set W2 according to FRAME_FROM. diff --git a/src/xfaces.c b/src/xfaces.c index 53c79366264..753b20765d8 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4692,13 +4692,15 @@ x_update_menu_appearance (f) { #ifdef USE_MOTIF const char *suffix = "List"; + Bool motif = True; #else const char *suffix = ""; + Bool motif = False; #endif -#if defined HAVE_X_I18N && defined USE_MOTIF +#if defined HAVE_X_I18N extern char *xic_create_fontsetname P_ ((char *base_fontname, Bool motif)); - char *fontsetname = xic_create_fontsetname (face->font_name, True); + char *fontsetname = xic_create_fontsetname (face->font_name, motif); #else char *fontsetname = face->font_name; #endif @@ -4709,6 +4711,8 @@ x_update_menu_appearance (f) myname, popup_path, suffix, fontsetname); XrmPutLineResource (&rdb, line); changed_p = 1; + if (fontsetname != face->font_name) + xfree (fontsetname); } if (changed_p && f->output_data.x->menubar_widget) -- 2.39.2