diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 94db6c68605..20fd021a376 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-12-10 Jan Djärv <jan.h.d@swipnet.se> + + * xterm.c (x_term_init): Move call to gdk_window_add_filter before + gtk_init (Bug#10100). + 2011-12-10 Eli Zaretskii <eliz@gnu.org> * xdisp.c (RECORD_MAX_MIN_POS): Use IT->cmp_it.charpos only if diff --git a/src/xterm.c b/src/xterm.c index abe52238415..1f995b3c1a0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9961,6 +9961,11 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) https://bugzilla.gnome.org/show_bug.cgi?id=563627. */ id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, my_log_handler, NULL); + + /* NULL window -> events for all windows go to our function. + Call before gtk_init so Gtk+ event filters comes after our. */ + gdk_window_add_filter (NULL, event_handler_gdk, NULL); + gtk_init (&argc, &argv2); g_log_remove_handler ("GLib", id); @@ -9970,9 +9975,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) dpy = DEFAULT_GDK_DISPLAY (); - /* NULL window -> events for all windows go to our function */ - gdk_window_add_filter (NULL, event_handler_gdk, NULL); - #if GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION <= 90 /* Load our own gtkrc if it exists. */ { |