diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2011-12-10 23:53:28 +0100 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2011-12-10 23:53:28 +0100 |
commit | 7b9d523a07395ecea505be88f45c33d73aea7038 (patch) | |
tree | a434ce64661b23273dde74518291ee93c928a9f0 /src/xterm.c | |
parent | b73189c64fa97828b5525f24d0c784a050487eb7 (diff) | |
download | emacs-7b9d523a07395ecea505be88f45c33d73aea7038.tar.gz |
* src/xterm.c (x_term_init): Move call to gdk_window_add_filter before
gtk_init.
Fixes: debbugs:10100
Diffstat (limited to 'src/xterm.c')
-rw-r--r-- | src/xterm.c | 8 |
1 files changed, 5 insertions, 3 deletions
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. */ { |