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

chrome/browser/gtk/tab_contents_drag_source.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/tab_contents_drag_source.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "base/file_util.h"
@@ skipping 14 matching lines @@
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperationNone;
 
 TabContentsDragSource::TabContentsDragSource(
     TabContentsView* tab_contents_view)
     : tab_contents_view_(tab_contents_view),
       drag_pixbuf_(NULL),
       drag_failed_(false),
-      drag_widget_(NULL),
-      drag_icon_(NULL) {
-  drag_widget_ = gtk_invisible_new();
-  g_signal_connect(drag_widget_, "drag-failed",
+      drag_widget_(gtk_invisible_new()),
+      drag_icon_(gtk_window_new(GTK_WINDOW_POPUP)) {
+  g_object_ref(drag_widget_);
+  signals_.Connect(drag_widget_, "drag-failed",
                    G_CALLBACK(OnDragFailedThunk), this);
-  g_signal_connect(drag_widget_, "drag-begin", G_CALLBACK(OnDragBeginThunk),
+  signals_.Connect(drag_widget_, "drag-begin",
+                   G_CALLBACK(OnDragBeginThunk),
                    this);
-  g_signal_connect(drag_widget_, "drag-end", G_CALLBACK(OnDragEndThunk), this);
-  g_signal_connect(drag_widget_, "drag-data-get",
+  signals_.Connect(drag_widget_, "drag-end",
+                   G_CALLBACK(OnDragEndThunk), this);
+  signals_.Connect(drag_widget_, "drag-data-get",
                    G_CALLBACK(OnDragDataGetThunk), this);
-  g_object_ref_sink(drag_widget_);
+
+  g_object_ref(drag_icon_);
+  signals_.Connect(drag_icon_, "expose-event",
+                   G_CALLBACK(OnDragIconExposeThunk), this);
 }
 
 TabContentsDragSource::~TabContentsDragSource() {
-  g_signal_handlers_disconnect_by_func(drag_widget_,
-      reinterpret_cast<gpointer>(OnDragFailedThunk), this);
-  g_signal_handlers_disconnect_by_func(drag_widget_,
-      reinterpret_cast<gpointer>(OnDragBeginThunk), this);
-  g_signal_handlers_disconnect_by_func(drag_widget_,
-      reinterpret_cast<gpointer>(OnDragEndThunk), this);
-  g_signal_handlers_disconnect_by_func(drag_widget_,
-      reinterpret_cast<gpointer>(OnDragDataGetThunk), this);
-
   // Break the current drag, if any.
   if (drop_data_.get()) {
     gtk_grab_add(drag_widget_);
     gtk_grab_remove(drag_widget_);
     MessageLoopForUI::current()->RemoveObserver(this);
     drop_data_.reset();
   }
 
-  gtk_widget_destroy(drag_widget_);
   g_object_unref(drag_widget_);
-  drag_widget_ = NULL;
+  g_object_unref(drag_icon_);
 }
 
 TabContents* TabContentsDragSource::tab_contents() const {
   return tab_contents_view_->tab_contents();
 }
 
 void TabContentsDragSource::StartDragging(const WebDropData& drop_data,
                                           WebDragOperationsMask allowed_ops,
                                           GdkEventButton* last_mouse_down,
                                           const SkBitmap& image,
@@ skipping 233 matching lines @@
                         gtk_dnd_util::GetAtomForTarget(
                             gtk_dnd_util::TEXT_PLAIN_NO_CHARSET),
                         8,
                         GDK_PROP_MODE_REPLACE,
                         reinterpret_cast<const guchar*>(
                             generated_download_file_name.value().c_str()),
                         generated_download_file_name.value().length());
   }
 
   if (drag_pixbuf_) {
-    drag_icon_ = gtk_window_new(GTK_WINDOW_POPUP);
-    g_object_ref_sink(drag_icon_);
-    g_signal_connect(drag_icon_, "expose-event",
-                     G_CALLBACK(OnDragIconExposeThunk), this);
     gtk_widget_set_size_request(drag_icon_,
                                 gdk_pixbuf_get_width(drag_pixbuf_),
                                 gdk_pixbuf_get_height(drag_pixbuf_));
 
-    GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(drag_icon_));
+    GdkScreen* screen = gtk_widget_get_screen(drag_icon_);
     GdkColormap* rgba = gdk_screen_get_rgba_colormap(screen);
     if (rgba)
-      gtk_widget_set_colormap(GTK_WIDGET(drag_icon_), rgba);
+      gtk_widget_set_colormap(drag_icon_, rgba);
 
     gtk_drag_set_icon_widget(drag_context, drag_icon_,
                              image_offset_.x(), image_offset_.y());
   }
 }
 
 void TabContentsDragSource::OnDragEnd(GtkWidget* sender,
                                       GdkDragContext* drag_context) {
-  if (drag_icon_) {
-    g_object_unref(drag_icon_);
-    drag_icon_ = NULL;
-  }
   if (drag_pixbuf_) {
     g_object_unref(drag_pixbuf_);
     drag_pixbuf_ = NULL;
   }
 
   MessageLoopForUI::current()->RemoveObserver(this);
 
   if (!download_url_.is_empty()) {
     gdk_property_delete(drag_context->source_window,
                         gtk_dnd_util::GetAtomForTarget(
@@ skipping 26 matching lines @@
   cairo_t* cr = gdk_cairo_create(event->window);
   gdk_cairo_rectangle(cr, &event->area);
   cairo_clip(cr);
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   gdk_cairo_set_source_pixbuf(cr, drag_pixbuf_, 0, 0);
   cairo_paint(cr);
   cairo_destroy(cr);
 
   return TRUE;
 }