* macmenu.c (add_menu_item): Fallback on MacRoman if encoding

menu text as UTF8 fails.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0eca89ab0c68a967fde1c932391f94ff009c7b94..2faf38841aa07aa619c86a22f8480a32d7ddda35 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/macmenu.c b/src/macmenu.c
index 007fab15eab76f14911d5844e07a3a14b11c1bfd..af24cfe237c18e4096098e52c4b7c6aa074f0723 100644 (file)
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -2267,6 +2267,14 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu,
        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);
       }