Comment 7 for bug 605799

Have committed a fix that makes the changes discussed above.
The problem with menubar not updating and needing a second mouse click (or cursor movement or just wait for a minute or so) appears to be some sort of redisplay/timing issue and possibly an emacs bug. Have applied a temporary work around that appears to work under Emacs built with GTK. Needs further investigation.