Linux: fix icon theme double free on shutdown....

chrome/browser/gtk/download_item_gtk.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/download_item_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
@@ skipping 232 matching lines @@
                     reinterpret_cast<void*>(true));
   gtk_widget_set_size_request(menu_button_, kMenuButtonWidth, 0);
 
   GtkWidget* shelf_hbox = parent_shelf->GetHBox();
   hbox_.Own(gtk_hbox_new(FALSE, 0));
   gtk_box_pack_start(GTK_BOX(hbox_.get()), body_.get(), FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(hbox_.get()), menu_button_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(shelf_hbox), hbox_.get(), FALSE, FALSE, 0);
   // Insert as the leftmost item.
   gtk_box_reorder_child(GTK_BOX(shelf_hbox), hbox_.get(), 1);
-
-  resize_handler_id_ = g_signal_connect(G_OBJECT(shelf_hbox), "size-allocate",
-                                        G_CALLBACK(OnShelfResized), this);
+  g_signal_connect(G_OBJECT(shelf_hbox), "size-allocate",
+                   G_CALLBACK(OnShelfResized), this);
 
   get_download()->AddObserver(this);
 
   new_item_animation_.reset(new SlideAnimation(this));
   new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
   gtk_widget_show_all(hbox_.get());
 
   if (IsDangerous()) {
     // Hide the download item components for now.
     gtk_widget_hide(body_.get());
@@ skipping 73 matching lines @@
     gtk_widget_size_request(dangerous_label, &req);
     dangerous_hbox_start_width_ = dangerous_hbox_full_width_ - req.width;
   }
 
   new_item_animation_->Show();
 }
 
 DownloadItemGtk::~DownloadItemGtk() {
   StopDownloadProgress();
   get_download()->RemoveObserver(this);
+  g_signal_handlers_disconnect_by_func(parent_shelf_->GetHBox(),
+      reinterpret_cast<gpointer>(OnShelfResized), this);
 
   hbox_.Destroy();
   progress_area_.Destroy();
   body_.Destroy();
 }
 
 void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download) {
   DCHECK_EQ(download, get_download());
 
   if (dangerous_prompt_ != NULL &&
       download->safety_state() == DownloadItem::DANGEROUS_BUT_VALIDATED) {
     // We have been approved.
     gtk_widget_show_all(hbox_.get());
     gtk_widget_destroy(dangerous_prompt_);
     dangerous_prompt_ = NULL;
   }
 
   switch (download->state()) {
     case DownloadItem::REMOVING:
-      // We disconnect here rather than the d'tor because we don't want to
-      // explicitly disconnect if |parent_shelf_| has been destroyed.
-      g_signal_handler_disconnect(parent_shelf_->GetHBox(), resize_handler_id_);
       parent_shelf_->RemoveDownloadItem(this);  // This will delete us!
       return;
     case DownloadItem::CANCELLED:
       StopDownloadProgress();
       break;
     case DownloadItem::COMPLETE:
       StopDownloadProgress();
       complete_animation_.reset(new SlideAnimation(this));
       complete_animation_->SetSlideDuration(kCompleteAnimationDurationMs);
       complete_animation_->SetTweenType(SlideAnimation::NONE);
@@ skipping 285 matching lines @@
       item->get_download());
 }
 
 // static
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button,
                                          DownloadItemGtk* item) {
   if (item->get_download()->state() == DownloadItem::IN_PROGRESS)
     item->get_download()->Cancel(true);
   item->get_download()->Remove(true);
 }