2 files changed, 4 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fd12877d2ce..7779dddb124 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2004-08-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
+        * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection
+        from 2002-07-15T00:01:34Z!raeburn@raeburn.org so that strings from ENCODE_UTF_8 isn't GC:ed before used.
+
         * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when
         tool bar items is 0.
 
diff --git a/src/xmenu.c b/src/xmenu.c
index 473e29de88d..7ef0e8c857d 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1930,6 +1930,7 @@ set_frame_menubar (f, first_time, deep_p)
       FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
 
       items = FRAME_MENU_BAR_ITEMS (f);
+      inhibit_garbage_collection ();
 
       /* Save the frame's previous menu bar contents data.  */
       if (previous_menu_items_used)