aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2011-10-30 18:31:02 +0100
committerJan Djärv2011-10-30 18:31:02 +0100
commit3b574623e9ae5c67a9b7f6e94178e346a97733ff (patch)
treea5bfeefd4ca15d0b509b4cbc4548831403c84cbf /src
parentb77a6a7f9c876223da0152752da6b441ad7dc3ce (diff)
downloademacs-3b574623e9ae5c67a9b7f6e94178e346a97733ff.tar.gz
emacs-3b574623e9ae5c67a9b7f6e94178e346a97733ff.zip
* gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
type to GDK_NOTHING so valgrind does not complain. Fixes: debbugs:9901
Diffstat (limited to 'src')
-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 @@
12011-10-30 Jan Djärv <jan.h.d@swipnet.se> 12011-10-30 Jan Djärv <jan.h.d@swipnet.se>
2 2
3 * gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
4 type to GDK_NOTHING so valgrind does not complain (Bug#9901).
5
3 * xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893). 6 * xterm.h (x_display_info): Add Xatom_net_wm_state_hidden (Bug#9893).
4 7
5 * xterm.c: Declare x_handle_net_wm_state to return int. 8 * 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)
987 { 987 {
988 GdkEvent event; 988 GdkEvent event;
989 event.any.window = gdkwin; 989 event.any.window = gdkwin;
990 event.any.type = GDK_NOTHING;
990 gwdesc = gtk_get_event_widget (&event); 991 gwdesc = gtk_get_event_widget (&event);
991 } 992 }
992 993
@@ -3254,6 +3255,7 @@ xg_event_is_for_menubar (FRAME_PTR f, XEvent *event)
3254 gw = gdk_x11_window_lookup_for_display (gdpy, event->xbutton.window); 3255 gw = gdk_x11_window_lookup_for_display (gdpy, event->xbutton.window);
3255 if (! gw) return 0; 3256 if (! gw) return 0;
3256 gevent.any.window = gw; 3257 gevent.any.window = gw;
3258 gevent.any.type = GDK_NOTHING;
3257 gwdesc = gtk_get_event_widget (&gevent); 3259 gwdesc = gtk_get_event_widget (&gevent);
3258 if (! gwdesc) return 0; 3260 if (! gwdesc) return 0;
3259 if (! GTK_IS_MENU_BAR (gwdesc) 3261 if (! GTK_IS_MENU_BAR (gwdesc)