# HG changeset patch
# User Steven Tamm <steventamm@mac.com>
# Date 1101916282 0
# Node ID 60340bd280438fbbd064c9911a45bb1832ae84ad
# Parent  57741ce4cd6bfb5a45c38cbd610ff39122a06f15
* macmenu.c (add_menu_item): Fallback on MacRoman if encoding
menu text as UTF8 fails.

diff -r 57741ce4cd6b -r 60340bd28043 src/ChangeLog
--- a/src/ChangeLog	Wed Dec 01 14:10:23 2004 +0000
+++ b/src/ChangeLog	Wed Dec 01 15:51:22 2004 +0000
@@ -1,3 +1,8 @@
+2004-12-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macmenu.c (add_menu_item): Fallback on MacRoman if encoding
+	menu text as UTF8 fails.
+
 2004-12-01  Kim F. Storm  <storm@cua.dk>
 
 	* alloc.c: Add commentary for last change.
diff -r 57741ce4cd6b -r 60340bd28043 src/macmenu.c
--- a/src/macmenu.c	Wed Dec 01 14:10:23 2004 +0000
+++ b/src/macmenu.c	Wed Dec 01 15:51:22 2004 +0000
@@ -2267,6 +2267,14 @@
 	CFStringRef string =
 	  CFStringCreateWithCString (NULL, item_name, kCFStringEncodingUTF8);
 
+ 	if (string == NULL)
+ 	  {
+ 	    /* Failed to interpret as UTF8.  Fall back to Mac Roman.
+ 	       Maybe wv->name is corrupted?  */
+ 	    string = CFStringCreateWithCString (NULL, item_name,
+ 						kCFStringEncodingMacRoman);
+ 	  }
+	
 	SetMenuItemTextWithCFString (menu, pos, string);
 	CFRelease (string);
       }