touch: more fixes in the message pump.

base/message_pump_glib_x.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_pump_glib_x.h"
 
 #include <gdk/gdkx.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #else
@@ skipping 31 matching lines @@
   msgpump->SetupXInput2ForXWindow(GDK_WINDOW_XID(window));
 
   return true;
 }
 
 // We need to capture all the GDK windows that get created, and start
 // listening for XInput2 events. So we setup a callback to the 'realize'
 // signal for GTK+ widgets, so that whenever the signal triggers for any
 // GtkWidget, which means the GtkWidget should now have a GdkWindow, we can
 // setup XInput2 events for the GdkWindow.
+static guint realize_signal_id = 0;
+static guint realize_hook_id = 0;
+
 void SetupGtkWidgetRealizeNotifier(base::MessagePumpGlibX* msgpump) {
-  guint signal_id;
   gpointer klass = g_type_class_ref(GTK_TYPE_WIDGET);
 
-  g_signal_parse_name("realize", GTK_TYPE_WIDGET, &signal_id, NULL, FALSE);
-  g_signal_add_emission_hook(signal_id, 0, GtkWidgetRealizeCallback,
-      static_cast<gpointer>(msgpump), NULL);
+  g_signal_parse_name("realize", GTK_TYPE_WIDGET,
+                      &realize_signal_id, NULL, FALSE);
+  realize_hook_id = g_signal_add_emission_hook(realize_signal_id, 0,
+      GtkWidgetRealizeCallback, static_cast<gpointer>(msgpump), NULL);
 
   g_type_class_unref(klass);
 }
 
+void RemoveGtkWidgetRealizeNotifier() {
+  if (realize_signal_id != 0)
+    g_signal_remove_emission_hook(realize_signal_id, realize_hook_id);
+  realize_signal_id = 0;
+  realize_hook_id = 0;
+}
+
 #endif  // HAVE_XINPUT2
 
 }  // namespace
 
 namespace base {
 
 MessagePumpGlibX::MessagePumpGlibX() : base::MessagePumpForUI(),
 #if defined(HAVE_XINPUT2)
     xiopcode_(-1),
     masters_(),
     slaves_(),
 #endif
     gdksource_(NULL),
     dispatching_event_(false),
     capture_x_events_(0),
     capture_gdk_events_(0) {
   gdk_event_handler_set(&EventDispatcherX, this, NULL);
 
 #if defined(HAVE_XINPUT2)
   InitializeXInput2();
 #endif
   InitializeEventsToCapture();
 }
 
 MessagePumpGlibX::~MessagePumpGlibX() {
+#if defined(HAVE_XINPUT2)
+  RemoveGtkWidgetRealizeNotifier();
+#endif
 }
 
 #if defined(HAVE_XINPUT2)
 void MessagePumpGlibX::SetupXInput2ForXWindow(Window xwindow) {
   Display* xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 
   // Setup mask for mouse events.
   unsigned char mask[(XI_LASTEVENT + 7)/8];
   memset(mask, 0, sizeof(mask));
 
@@ skipping 19 matching lines @@
   XISelectEvents(xdisplay, xwindow, evmasks, masters_.size());
 
   // TODO(sad): Setup masks for keyboard events.
 
   XFlush(xdisplay);
 }
 #endif  // HAVE_XINPUT2
 
 bool MessagePumpGlibX::RunOnce(GMainContext* context, bool block) {
   GdkDisplay* gdisp = gdk_display_get_default();
-  if (!gdisp)
+  if (!gdisp || !GetDispatcher())
     return MessagePumpForUI::RunOnce(context, block);
 
   Display* display = GDK_DISPLAY_XDISPLAY(gdisp);
   bool should_quit = false;
 
   if (XPending(display)) {
     XEvent xev;
     XPeekEvent(display, &xev);
     if (capture_x_events_[xev.type]
 #if defined(HAVE_XINPUT2)
@@ skipping 154 matching lines @@
   XIFreeDeviceInfo(devices);
 
   // TODO(sad): Select on root for XI_HierarchyChanged so that slaves_ and
   // masters_ can be kept up-to-date. This is a relatively rare event, so we can
   // put it off for a later time.
   // Note: It is not necessary to listen for XI_DeviceChanged events.
 }
 #endif  // HAVE_XINPUT2
 
 }  // namespace base