GTK: make more use of gtk_signal convenience macros/signal registrar.

chrome/browser/gtk/hover_controller_gtk.cc

Index: chrome/browser/gtk/hover_controller_gtk.cc
diff --git a/chrome/browser/gtk/hover_controller_gtk.cc b/chrome/browser/gtk/hover_controller_gtk.cc
index 50a8f1ae1fb65befd441b89069b1e2ff4606d8c7..0737a97bb9c0b442522ef8f8d1a3b5b51b971b4e 100644
--- a/chrome/browser/gtk/hover_controller_gtk.cc
+++ b/chrome/browser/gtk/hover_controller_gtk.cc
@@ -16,12 +16,12 @@ HoverControllerGtk::HoverControllerGtk(GtkWidget* button)
   g_object_ref(button_);
   gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), 0);
 
-  g_signal_connect(button_, "enter-notify-event",
+  signals_.Connect(button_, "enter-notify-event",
                    G_CALLBACK(OnEnterThunk), this);
-  g_signal_connect(button_, "leave-notify-event",
+  signals_.Connect(button_, "leave-notify-event",
                    G_CALLBACK(OnLeaveThunk), this);
-  g_signal_connect(button_, "destroy",
-                   G_CALLBACK(OnButtonDestroyThunk), this);
+  signals_.Connect(button_, "destroy",
+                   G_CALLBACK(OnDestroyThunk), this);
 
 #ifndef NDEBUG
   if (g_object_get_data(G_OBJECT(button_), kHoverControllerGtkKey))
@@ -54,10 +54,7 @@ HoverControllerGtk* HoverControllerGtk::GetHoverControllerGtk(
 
 void HoverControllerGtk::Destroy() {
   gtk_chrome_button_set_hover_state(GTK_CHROME_BUTTON(button_), -1.0);
-  g_signal_handlers_disconnect_by_func(
-      button_,
-      reinterpret_cast<gpointer>(OnButtonDestroyThunk),
-      this);

[Elliot Glaysher, 2010/04/28 16:39:13]

I'm not so sure that these are equivalent. Previously, you were disconnecting
from button_'s OnButtonDestroyThunk before you called g_object_unref(button_).
Now that will happen afterwards. And why disconnect here in the destroy thunk at
all?

[Evan Stade, 2010/04/28 19:00:51]

it's not equivalent, but I believe the new code to be correct. Also note that
the other two signal handlers were not being disconnected when
HoverControllerGtk was destructed, which is a bug, and is exactly what the
signal registrar is designed to prevent.
yea, not much point since the signal handler will disconnect itself on destroy.

+
   g_object_set_data(G_OBJECT(button_), kHoverControllerGtkKey, NULL);
   g_object_unref(button_);
   button_ = NULL;
@@ -111,6 +108,6 @@ gboolean HoverControllerGtk::OnLeave(GtkWidget* widget,
   return FALSE;
 }
 
-void HoverControllerGtk::OnButtonDestroy(GtkWidget* widget) {
+void HoverControllerGtk::OnDestroy(GtkWidget* widget) {
   Destroy();
 }