GTK: more signal handler foolproofing.

chrome/browser/gtk/menu_bar_helper.cc

 // Copyright (c) 2009 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 "chrome/browser/gtk/menu_bar_helper.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/gtk/gtk_util.h"
@@ skipping 61 matching lines @@
 }
 
 void MenuBarHelper::Clear() {
   buttons_.clear();
 }
 
 void MenuBarHelper::MenuStartedShowing(GtkWidget* button, GtkWidget* menu) {
   DCHECK(GTK_IS_MENU(menu));
   button_showing_menu_ = button;
   showing_menu_ = menu;
-  g_signal_connect(menu, "motion-notify-event",
-                   G_CALLBACK(OnMenuMotionNotifyThunk), this);
-  g_signal_connect(menu, "hide",
-                   G_CALLBACK(OnMenuHiddenThunk), this);
-  g_signal_connect(menu, "move-current",
-                   G_CALLBACK(OnMenuMoveCurrentThunk), this);
+
+  signal_handlers_.reset(new GtkSignalRegistrar());
+  signal_handlers_->Connect(menu, "motion-notify-event",
+                            G_CALLBACK(OnMenuMotionNotifyThunk), this);
+  signal_handlers_->Connect(menu, "hide",
+                            G_CALLBACK(OnMenuHiddenThunk), this);
+  signal_handlers_->Connect(menu, "move-current",
+                            G_CALLBACK(OnMenuMoveCurrentThunk), this);
   gtk_container_foreach(GTK_CONTAINER(menu), PopulateSubmenus, &submenus_);
+
   for (size_t i = 0; i < submenus_.size(); ++i) {
-    g_signal_connect(submenus_[i], "motion-notify-event",
-                     G_CALLBACK(OnMenuMotionNotifyThunk), this);
+    signal_handlers_->Connect(submenus_[i], "motion-notify-event",
+                              G_CALLBACK(OnMenuMotionNotifyThunk), this);
   }
 }
 
 gboolean MenuBarHelper::OnMenuMotionNotify(GtkWidget* menu,
                                            GdkEventMotion* motion) {
   // Don't do anything if pointer is in the menu.
   if (MotionIsOverMenu(menu, motion))
     return FALSE;
   if (buttons_.empty())
     return FALSE;
@@ skipping 29 matching lines @@
         delegate_->PopupForButton(button);
       return TRUE;
     }
   }
 
   return FALSE;
 }
 
 void MenuBarHelper::OnMenuHidden(GtkWidget* menu) {
   DCHECK_EQ(showing_menu_, menu);
-  int matched = g_signal_handlers_disconnect_matched(showing_menu_,
-      G_SIGNAL_MATCH_DATA, 0, NULL, NULL, NULL, this);
-  DCHECK_EQ(3, matched);
 
-  for (size_t i = 0; i < submenus_.size(); ++i) {
-    g_signal_handlers_disconnect_by_func(submenus_[i],
-        reinterpret_cast<gpointer>(OnMenuMotionNotifyThunk), this);
-  }
+  signal_handlers_.reset();
   showing_menu_ = NULL;
   button_showing_menu_ = NULL;
   submenus_.clear();
 }
 
 void MenuBarHelper::OnMenuMoveCurrent(GtkWidget* menu,
                                       GtkMenuDirectionType dir) {
   // The menu directions are triggered by the arrow keys as follows
   //
   //   PARENT   left
@@ skipping 15 matching lines @@
       break;
     }
     default:
       return;
   }
 
   // This signal doesn't have a return value; we have to manually stop its
   // propagation.
   g_signal_stop_emission_by_name(menu, "move-current");
 }