[Emacs-diffs] /srv/bzr/emacs/trunk r106248: * gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize

[Jan D.]

------------------------------------------------------------
revno: 106248
fixes bug(s): http://debbugs.gnu.org/9901
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2011-10-30 18:31:02 +0100
message:
  * gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
  type to GDK_NOTHING so valgrind does not complain.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-30 17:17:48 +0000
+++ b/src/ChangeLog     2011-10-30 17:31:02 +0000
@@ -1,5 +1,8 @@
 2011-10-30  Jan Djärv  <address@hidden>
 
+       * gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
+       type to GDK_NOTHING so valgrind does not complain (Bug#9901).
+
        * xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893).
 
        * xterm.c: Declare x_handle_net_wm_state to return int.

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2011-09-09 01:06:52 +0000
+++ b/src/gtkutil.c     2011-10-30 17:31:02 +0000
@@ -987,6 +987,7 @@
     {
       GdkEvent event;
       event.any.window = gdkwin;
+      event.any.type = GDK_NOTHING;
       gwdesc = gtk_get_event_widget (&event);
     }
 
@@ -3254,6 +3255,7 @@
   gw = gdk_x11_window_lookup_for_display (gdpy, event->xbutton.window);
   if (! gw) return 0;
   gevent.any.window = gw;
+  gevent.any.type = GDK_NOTHING;
   gwdesc = gtk_get_event_widget (&gevent);
   if (! gwdesc) return 0;
   if (! GTK_IS_MENU_BAR (gwdesc)