summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2011-10-30 18:31:02 +0100
committerJan Djärv <jan.h.d@swipnet.se>2011-10-30 18:31:02 +0100
commit3b574623e9ae5c67a9b7f6e94178e346a97733ff (patch)
treea5bfeefd4ca15d0b509b4cbc4548831403c84cbf
parentb77a6a7f9c876223da0152752da6b441ad7dc3ce (diff)
downloademacs-3b574623e9ae5c67a9b7f6e94178e346a97733ff.tar.gz
* gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
type to GDK_NOTHING so valgrind does not complain. Fixes: debbugs:9901
-rw-r--r--src/ChangeLog3
-rw-r--r--src/gtkutil.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d19cadef984..ea367bd77d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2011-10-30 Jan Djärv <jan.h.d@swipnet.se>
+ * 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.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 3cac8084dea..26959d57d4b 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -987,6 +987,7 @@ xg_win_to_widget (Display *dpy, Window wdesc)
{
GdkEvent event;
event.any.window = gdkwin;
+ event.any.type = GDK_NOTHING;
gwdesc = gtk_get_event_widget (&event);
}
@@ -3254,6 +3255,7 @@ xg_event_is_for_menubar (FRAME_PTR f, XEvent *event)
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)