Wireshark · Wireshark-commits: [Wireshark-commits] rev 41591: /trunk/ui/gtk/ /trunk/ui/gtk/: funnel_stat.c main_menubar.c

[morriss@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=41591

User: morriss
Date: 2012/03/15 07:36 PM

Log:
 Get the Lua menus working again: when adding UI menus, it appears that our
 description of existing menus must be accurate: if a name and action are
 both specified then the to-be-added-XML must include both the name and the
 action.
 
 It appears that the formats given in stat_group_name()'s value_string were
 designed to take this into account, but there was no code to separate the menu
 name from its action.  Adding that separation is complicated by the fact that
 menus are separated by /'s and actions may also contain that character.  To
 deal with that, "escape" the /'s in actions by replacing them with #'s.
 make_menu_xml() then un-escapes them back into /'s.
 
 There has to be an easier way to do all of this...

Directory: /trunk/ui/gtk/
  Changes    Path              Action
  +10 -9     funnel_stat.c     Modified
  +31 -7     main_menubar.c    Modified