[Emacs-diffs] /srv/bzr/emacs/trunk r106249: Fix bug 9869.

[Jan D.]

------------------------------------------------------------
revno: 106249
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2011-10-30 19:04:13 +0100
message:
  Fix bug 9869.
  
  xterm.c: Include X11/Xproto.h if HAVE_GTK3.
  (x_error_handler): Ignore BadMatch for X_SetInputFocus for
  HAVE_GTK3 (Bug#9869).
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-30 17:31:02 +0000
+++ b/src/ChangeLog     2011-10-30 18:04:13 +0000
@@ -1,4 +1,8 @@
-2011-10-30  Jan Djärv  <address@hidden>
+2011-10-30  Adam Sjøgren <address@hidden> (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).

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-10-30 17:17:48 +0000
+++ b/src/xterm.c       2011-10-30 18:04:13 +0000
@@ -93,6 +93,9 @@
 
 #ifdef USE_GTK
 #include "gtkutil.h"
+#ifdef HAVE_GTK3
+#include <X11/Xproto.h>
+#endif
 #endif
 
 #ifdef USE_LUCID
@@ -7869,6 +7872,15 @@
 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