xterm.c: Include X11/Xproto.h if HAVE_GTK3.
(x_error_handler): Ignore BadMatch for X_SetInputFocus for
HAVE_GTK3 (Bug#9869).
-2011-10-30 Jan Djärv <jan.h.d@swipnet.se>
+2011-10-30 Adam Sjøgren <asjo@koldfront.dk> (tiny change)
+
+ * xterm.c: Include X11/Xproto.h if HAVE_GTK3.
+ (x_error_handler): Ignore BadMatch for X_SetInputFocus for
+ HAVE_GTK3 (Bug#9869).
* gtkutil.c (xg_win_to_widget, xg_event_is_for_menubar): Initialize
type to GDK_NOTHING so valgrind does not complain (Bug#9901).
#ifdef USE_GTK
#include "gtkutil.h"
+#ifdef HAVE_GTK3
+#include <X11/Xproto.h>
+#endif
#endif
#ifdef USE_LUCID
static int
x_error_handler (Display *display, XErrorEvent *event)
{
+#ifdef HAVE_GTK3
+ if (event->error_code == BadMatch
+ && event->request_code == X_SetInputFocus
+ && event->minor_code == 0)
+ {
+ return 0;
+ }
+#endif
+
if (x_error_message)
x_error_catcher (display, event);
else