gtk: Disconnect the accelerator group keys when closing the browser window....

chrome/browser/gtk/browser_window_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/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
+#include <string>
+
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/base_paths_linux.h"
 #include "base/command_line.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/rect.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 363 matching lines @@
 std::map<XID, GtkWindow*> BrowserWindowGtk::xid_map_;
 
 BrowserWindowGtk::BrowserWindowGtk(Browser* browser)
     :  browser_(browser),
 #if defined(OS_CHROMEOS)
        drag_active_(false),
        panel_controller_(NULL),
 #endif
        frame_cursor_(NULL),
        is_active_(true),
-       last_click_time_(0) {
+       last_click_time_(0),
+       accel_group_(NULL) {
   use_custom_frame_.Init(prefs::kUseCustomChromeFrame,
       browser_->profile()->GetPrefs(), this);
 
   window_ = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
   g_object_set_data(G_OBJECT(window_), kBrowserWindowKey, this);
   gtk_widget_add_events(GTK_WIDGET(window_), GDK_BUTTON_PRESS_MASK |
                                              GDK_POINTER_MOTION_MASK);
 
   // Add this window to its own unique window group to allow for
   // window-to-parent modality.
@@ skipping 253 matching lines @@
 void BrowserWindowGtk::Close() {
   // We're already closing.  Do nothing.
   if (!window_)
     return;
 
   if (!CanClose())
     return;
 
   SaveWindowPosition();
 
+  if (accel_group_) {
+    // Disconnecting the keys we connected to our accelerator group frees the
+    // closures allocated in ConnectAccelerators.
+    for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
+      gtk_accel_group_disconnect_key(accel_group_,
+                                     kAcceleratorMap[i].keyval,
+                                     kAcceleratorMap[i].modifier_type);
+    }
+    gtk_window_remove_accel_group(window_, accel_group_);
+    g_object_unref(accel_group_);
+    accel_group_ = NULL;
+  }
+
   GtkWidget* window = GTK_WIDGET(window_);
   // To help catch bugs in any event handlers that might get fired during the
   // destruction, set window_ to NULL before any handlers will run.
   window_ = NULL;
   gtk_widget_destroy(window);
 
 #if defined(OS_CHROMEOS)
   if (panel_controller_) {
     panel_controller_->Close();
   }
@@ skipping 746 matching lines @@
       gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, mask, 0, 0);
       gdk_region_destroy(mask);
     } else {
       gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, NULL, 0, 0);
     }
     gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 0, 0, 0, 0);
   }
 }
 
 void BrowserWindowGtk::ConnectAccelerators() {
-  GtkAccelGroup* accel_group = gtk_accel_group_new();
-  gtk_window_add_accel_group(window_, accel_group);
-  // Drop the initial ref on |accel_group| so |window_| will own it.
-  g_object_unref(accel_group);
+  accel_group_ = gtk_accel_group_new();
+  gtk_window_add_accel_group(window_, accel_group_);
 
   for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
     gtk_accel_group_connect(
-        accel_group,
+        accel_group_,
         kAcceleratorMap[i].keyval,
         kAcceleratorMap[i].modifier_type,
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
   }
 }
 
 void BrowserWindowGtk::UpdateCustomFrame() {
   bool enable = use_custom_frame_.GetValue() && !IsFullscreen();
   gtk_window_set_decorated(window_, !use_custom_frame_.GetValue());
@@ skipping 359 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Fluxbox" ||
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }