Make GTK+ menus work correctly with the Unity global menu

diff --cc src/ChangeLog
index 4991d74135b0fe5b899eefbe80d5f1db1a64df4b,26fe4732ce853b2137c9d0ae774ee5bd49e30f7d..2929c03329cb95d02c8afd146087a141490165d2
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,46 -1,19 +1,62 @@@
+ 2014-01-13  Daniel Colascione  <dancol@dancol.org>
+ 
+       Fix menu item updating in the presence of the Unity global menu
+       GTK+ module.
+ 
+       * gtkutil.h (xg_have_tear_offs): Add frame parameter
+       * gtkutil.c (xg_have_tear_offs): Count the global menu as a
+       tear-off.
+       (xg_update_menubar,xg_update_menu_item): Call g_object_notify when
+       updating menus; explain why.
+       (xg_update_frame_menubar): Remove the 23px hack: I can't repro the
+       problem it's supposed to solve and it interferes with detecting
+       the presence of a global menu.
+       * xmenu.c (set_frame_menubar): Call xg_have_tear_offs with new
+       parameter.
+ 
 +2014-01-11  K. Handa  <handa@gnu.org>
 +
 +      * composite.c (composition_update_it): Fix indexing of
 +      LGSTRING_CHAR (Bug#15984).
 +
 +2014-01-11  Fabrice Popineau  <fabrice.popineau@gmail.com>
 +
 +      * unexw32.c (_start) [__MINGW64__]: Define to __start.
 +
 +2014-01-11  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * xdisp.c (try_window_id): Don't use this function's optimizations
 +      if overlays in the buffer displayed by the window have changed
 +      since last redisplay.  (Bug#16347)
 +      (message_dolog): Fix indentation.
 +
 +2014-01-11  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * frame.c (frame_resize_pixelwise): Fix doc-string.
 +
 +2014-01-10  Martin Rudalics  <rudalics@gmx.at>
 +
 +      Fix handling of internal borders (Bug#16348).
 +      * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Remove
 +      internal border width from pixel width of windows.
 +      (change_frame_size_1): Don't return early when frame's pixel
 +      size changes - we still have to record the new sizes in the
 +      frame structure.
 +      * w32fns.c (x_set_tool_bar_lines): Clear internal border width
 +      also when toolbar gets larger.
 +      * window.c (check_frame_size): Include internal_border_width in
 +      check.
 +      * xdisp.c (Ftool_bar_height): Fix doc-string typo.
 +      * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): In
 +      non-toolkit/non-GTK version clear internal border.
 +      * xterm.c (x_clear_under_internal_border): New function for
 +      non-toolkit/non-GTK version.
 +      (x_after_update_window_line): In non-toolkit/non-GTK version
 +      don't do that.
 +      (handle_one_xevent, x_set_window_size): Call
 +      x_clear_under_internal_border in non-toolkit/non-GTK version.
 +      * xterm.h (x_clear_under_internal_border): Extern it.
 +
  2014-01-07  Paul Eggert  <eggert@cs.ucla.edu>
  
        Fix misdisplay of interlaced GIFs with libgif5 (Bug#16372).