comparison src/xmenu.c @ 9725:98d374d51f4d

(set_frame_menubar): Don't copy string during GC risk.

9724:193eeb5e78aa

     int first_time;
{
  Widget menubar_widget = f->display.x->menubar_widget;
  int id = (int) f;
  Lisp_Object tail, items;
  widget_value *wv, *save_wv, *first_wv, *prev_wv = 0;
  int i;

  BLOCK_INPUT;

  wv = malloc_widget_value ();
  wv->name = "menubar";
  wv->value = 0;
  wv->enabled = 1;
  save_wv = first_wv = wv;
  items = FRAME_MENU_BAR_ITEMS (f);
  menu_items = f->menu_bar_vector;
  menu_items_allocated = XVECTOR (menu_items)->size;
  init_menu_items ();

	break;

      wv = single_submenu (key, string, maps);
      if (prev_wv) 
	prev_wv->next = wv;
      else 
	save_wv->contents = wv;
      wv->name = (char *) XSTRING (string)->data;
      wv->enabled = 1;
      prev_wv = wv;
    }

  finish_menu_items ();

  f->menu_bar_vector = menu_items;

9725:98d374d51f4d

     int first_time;
{
  Widget menubar_widget = f->display.x->menubar_widget;
  int id = (int) f;
  Lisp_Object tail, items;
  widget_value *wv, *first_wv, *prev_wv = 0;
  int i;

  BLOCK_INPUT;

  wv = malloc_widget_value ();
  wv->name = "menubar";
  wv->value = 0;
  wv->enabled = 1;
  first_wv = wv;
  items = FRAME_MENU_BAR_ITEMS (f);
  menu_items = f->menu_bar_vector;
  menu_items_allocated = XVECTOR (menu_items)->size;
  init_menu_items ();

	break;

      wv = single_submenu (key, string, maps);
      if (prev_wv) 
	prev_wv->next = wv;
      else
	first_wv->contents = wv;
      /* Don't set wv->name here; GC during the loop might relocate it.  */
      wv->enabled = 1;
      prev_wv = wv;
    }

  /* Now GC cannot happen during the lifetime of the widget_value,
     so it's safe to store data from a Lisp_String.  */
  wv = first_wv->contents;
  for (i = 0; i < XVECTOR (items)->size; i += 3)
    {
      Lisp_Object string;
      string = XVECTOR (items)->contents[i + 1];
      if (NILP (string))
	break;
      wv->name = (char *) XSTRING (string)->data;
      wv = wv->next;
    }

  finish_menu_items ();

  f->menu_bar_vector = menu_items;