# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1111085027 0
# Node ID cffa9a82128665452babe5d4f026de981869fc3e
# Parent  34f4b9f0b40d3376256706a8a1c1a4732c29e9f1
(x_update_menu_appearance) [USE_MOTIF]:
Use xic_create_fontsetname to create a fontset so utf-8 locales work.
(dump_realized_face): Fix warning.

diff -r 34f4b9f0b40d -r cffa9a821286 src/xfaces.c
--- a/src/xfaces.c	Thu Mar 17 18:32:33 2005 +0000
+++ b/src/xfaces.c	Thu Mar 17 18:43:47 2005 +0000
@@ -4695,11 +4695,18 @@
 #else
 	  const char *suffix = "";
 #endif
+#if defined HAVE_X_I18N && defined USE_MOTIF
+	  extern char *xic_create_fontsetname
+	    P_ ((char *base_fontname, Bool motif));
+	  char *fontsetname = xic_create_fontsetname (face->font_name, True);
+#else
+	  char *fontsetname = face->font_name;
+#endif
 	  sprintf (line, "%s.pane.menubar*font%s: %s",
-		   myname, suffix, face->font_name);
+		   myname, suffix, fontsetname);
 	  XrmPutLineResource (&rdb, line);
 	  sprintf (line, "%s.%s*font%s: %s",
-		   myname, popup_path, suffix, face->font_name);
+		   myname, popup_path, suffix, fontsetname);
 	  XrmPutLineResource (&rdb, line);
 	  changed_p = 1;
 	}
@@ -7765,7 +7772,7 @@
 {
   fprintf (stderr, "ID: %d\n", face->id);
 #ifdef HAVE_X_WINDOWS
-  fprintf (stderr, "gc: %d\n", (int) face->gc);
+  fprintf (stderr, "gc: %ld\n", (long) face->gc);
 #endif
   fprintf (stderr, "foreground: 0x%lx (%s)\n",
 	   face->foreground,