[Emacs-diffs] /srv/bzr/emacs/trunk r106659: * src/xterm.c (x_term_init): Move call to gdk_window_add_filter before

[Jan D.]

------------------------------------------------------------
revno: 106659
fixes bug(s): http://debbugs.gnu.org/10100
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sat 2011-12-10 23:53:28 +0100
message:
  * src/xterm.c (x_term_init): Move call to gdk_window_add_filter before
  gtk_init.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-10 19:54:45 +0000
+++ b/src/ChangeLog     2011-12-10 22:53:28 +0000
@@ -1,3 +1,8 @@
+2011-12-10  Jan Djärv  <address@hidden>
+
+       * xterm.c (x_term_init): Move call to gdk_window_add_filter before
+       gtk_init (Bug#10100).
+
 2011-12-10  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (RECORD_MAX_MIN_POS): Use IT->cmp_it.charpos only if

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-12-05 08:55:25 +0000
+++ b/src/xterm.c       2011-12-10 22:53:28 +0000
@@ -9961,6 +9961,11 @@
            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 @@
 
         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.  */
         {