diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-04 01:28:07 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-04 01:28:07 +0000 |
| commit | 1c2718400df991fa1dfaca93d31298001d73e458 (patch) | |
| tree | cffc669352d33169f007fa0f4e71633cb702cc4b /gtk/gtkxembed.c | |
| parent | d6b33b2ad531d98e9b895bbac6f791a746345a68 (diff) | |
| download | gtk+-1c2718400df991fa1dfaca93d31298001d73e458.tar.gz | |
Apply a patch by Chris Wilson to avoid spurious valgrind warnings from
2007-01-03 Matthias Clasen <mclasen@redhat.com>
* gtk/*.c:
* gdk/x11/*.c: Apply a patch by Chris Wilson to
avoid spurious valgrind warnings from XSendEvent()
calls. (#392532)
svn path=/trunk/; revision=17044
Diffstat (limited to 'gtk/gtkxembed.c')
| -rw-r--r-- | gtk/gtkxembed.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c index 723ed93cd1..2c56b0ba4a 100644 --- a/gtk/gtkxembed.c +++ b/gtk/gtkxembed.c @@ -19,6 +19,7 @@ */ #include <config.h> +#include <string.h> #include "gtkmain.h" #include "gtkprivate.h" #include "gtkxembed.h" @@ -139,7 +140,7 @@ _gtk_xembed_send_message (GdkWindow *recipient, glong data2) { GdkDisplay *display; - XEvent xevent; + XClientMessageEvent xclient; if (!recipient) return; @@ -150,20 +151,21 @@ _gtk_xembed_send_message (GdkWindow *recipient, GTK_NOTE (PLUGSOCKET, g_message ("Sending %s", _gtk_xembed_message_name (message))); - xevent.xclient.window = GDK_WINDOW_XWINDOW (recipient); - xevent.xclient.type = ClientMessage; - xevent.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED"); - xevent.xclient.format = 32; - xevent.xclient.data.l[0] = gtk_xembed_get_time (); - xevent.xclient.data.l[1] = message; - xevent.xclient.data.l[2] = detail; - xevent.xclient.data.l[3] = data1; - xevent.xclient.data.l[4] = data2; + memset (&xclient, 0, sizeof (xclient)); + xclient.window = GDK_WINDOW_XWINDOW (recipient); + xclient.type = ClientMessage; + xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED"); + xclient.format = 32; + xclient.data.l[0] = gtk_xembed_get_time (); + xclient.data.l[1] = message; + xclient.data.l[2] = detail; + xclient.data.l[3] = data1; + xclient.data.l[4] = data2; gdk_error_trap_push (); XSendEvent (GDK_WINDOW_XDISPLAY(recipient), GDK_WINDOW_XWINDOW (recipient), - False, NoEventMask, &xevent); + False, NoEventMask, &xclient); gdk_display_sync (display); gdk_error_trap_pop (); } |