procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug 9869.

Browse source 
xterm.c: Include X11/Xproto.h if HAVE_GTK3.
(x_error_handler): Ignore BadMatch for X_SetInputFocus for
HAVE_GTK3 (Bug#9869).
This commit is contained in:
Jan Djärv 2011-10-30 19:04:13 +01:00
parent 3b574623e9
commit 6e56383b57
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,4 +1,8 @@
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).

12
src/xterm.c
View file

@ -93,6 +93,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef USE_GTK
#include "gtkutil.h"
#ifdef HAVE_GTK3
#include <X11/Xproto.h>
#endif
#endif
#ifdef USE_LUCID
@ -7869,6 +7872,15 @@ static void x_error_quitter (Display *, XErrorEvent *);
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