commit 9e8b2611877d03badffbd16eebca6eaa453e3bf0
Author: Juan Pablo Ugarte <juanpablougarte@gmail.com>
Date:   Thu Aug 16 14:21:58 2012 -0300

    Added GtkActionGroup:accel-group property.
    Fixes bug #671786 "Glade XML files cannot set an ImageMenuItem accelerator key from an Action"

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 5e94658..ce27fe9 100644
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -109,6 +109,7 @@ struct _GtkActionGroupPrivate
   gboolean	   sensitive;
   gboolean	   visible;
   GHashTable      *actions;
+  GtkAccelGroup   *accel_group;
 
   GtkTranslateFunc translate_func;
   gpointer         translate_data;
@@ -129,7 +130,8 @@ enum
   PROP_0,
   PROP_NAME,
   PROP_SENSITIVE,
-  PROP_VISIBLE
+  PROP_VISIBLE,
+  PROP_ACCEL_GROUP
 };
 
 static void       gtk_action_group_init            (GtkActionGroup      *self);
@@ -241,6 +243,13 @@ gtk_action_group_class_init (GtkActionGroupClass *klass)
 							 P_("Whether the action group is visible."),
 							 TRUE,
 							 GTK_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class,
+				   PROP_ACCEL_GROUP,
+				   g_param_spec_object ("accel-group",
+                                                        P_("Accelerator Group"),
+                                                        P_("The accelerator group this actions should use or NULL to use the default accelerator map."),
+                                                        GTK_TYPE_ACCEL_GROUP,
+                                                        GTK_PARAM_READWRITE));
 
   /**
    * GtkActionGroup::connect-proxy:
@@ -490,17 +499,18 @@ gtk_action_group_buildable_custom_tag_end (GtkBuildable *buildable,
   if (strcmp (tagname, "accelerator") == 0)
     {
       GtkActionGroup *action_group;
-      GtkActionGroupPrivate *private;
+      GtkActionGroupPrivate *priv;
       GtkAction *action;
       gchar *accel_path;
+      GClosure *accel;
       
       data = (AcceleratorParserData*)user_data;
       action_group = GTK_ACTION_GROUP (buildable);
-      private = action_group->priv;
+      priv = action_group->priv;
       action = GTK_ACTION (child);
 	
       accel_path = g_strconcat ("<Actions>/",
-				private->name, "/",
+				priv->name, "/",
 				gtk_action_get_name (action), NULL);
 
       if (gtk_accel_map_lookup_entry (accel_path, NULL))
@@ -509,6 +519,9 @@ gtk_action_group_buildable_custom_tag_end (GtkBuildable *buildable,
 	gtk_accel_map_add_entry (accel_path, data->key, data->modifiers);
 
       gtk_action_set_accel_path (action, accel_path);
+
+      if (priv->accel_group && (accel = gtk_action_get_accel_closure (action)))
+        gtk_accel_group_connect_by_path (priv->accel_group, accel_path, accel);
       
       g_free (accel_path);
       g_slice_free (AcceleratorParserData, data);
@@ -555,6 +568,8 @@ gtk_action_group_finalize (GObject *object)
   g_hash_table_destroy (private->actions);
   private->actions = NULL;
 
+  g_clear_object (&private->accel_group);
+
   if (private->translate_notify)
     private->translate_notify (private->translate_data);
 
@@ -587,6 +602,9 @@ gtk_action_group_set_property (GObject         *object,
     case PROP_VISIBLE:
       gtk_action_group_set_visible (self, g_value_get_boolean (value));
       break;
+    case PROP_ACCEL_GROUP:
+      gtk_action_group_set_accel_group (self, g_value_get_object (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -616,6 +634,9 @@ gtk_action_group_get_property (GObject    *object,
     case PROP_VISIBLE:
       g_value_set_boolean (value, private->visible);
       break;
+    case PROP_ACCEL_GROUP:
+      g_value_set_object (value, private->accel_group);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -745,6 +766,23 @@ gtk_action_group_get_visible (GtkActionGroup *action_group)
   return private->visible;
 }
 
+
+/**
+ * gtk_action_group_get_accel_group:
+ * @action_group: the action group
+ *
+ * Gets the accelerator group. 
+ * 
+ * Since: 3.6
+ */
+GtkAccelGroup *
+gtk_action_group_get_accel_group (GtkActionGroup *action_group)
+{
+  g_return_val_if_fail (GTK_IS_ACTION_GROUP (action_group), FALSE);
+
+  return action_group->priv->accel_group;
+}
+
 static void
 cb_set_action_visiblity (const gchar *name, 
 			 GtkAction   *action)
@@ -785,6 +823,36 @@ gtk_action_group_set_visible (GtkActionGroup *action_group,
 }
 
 /**
+ * gtk_action_group_set_accel_group:
+ * @action_group: a #GtkActionGroup
+ * @accel_group: a #GtkAccelGroup to set
+ *
+ * Sets the accelerator group to use by this action group.
+ * This will be used to connect accelerator paths defined by the buildable
+ * "accelerator" custom tag.
+ * 
+ * Since: 3.6
+ */
+void
+gtk_action_group_set_accel_group (GtkActionGroup *action_group,
+                                  GtkAccelGroup  *accel_group)
+{
+  GtkActionGroupPrivate *private;
+
+  g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
+
+  private = action_group->priv;
+
+  if (private->accel_group == accel_group) return;
+
+  g_clear_object (&private->accel_group);
+
+  private->accel_group = g_object_ref (accel_group);
+
+  g_object_notify (G_OBJECT (action_group), "accel-group");
+}
+
+/**
  * gtk_action_group_get_action:
  * @action_group: the action group
  * @action_name: the name of the action
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 5f1658a..c5fdf2f 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -165,6 +165,9 @@ void            gtk_action_group_set_sensitive           (GtkActionGroup
 gboolean        gtk_action_group_get_visible             (GtkActionGroup             *action_group);
 void            gtk_action_group_set_visible             (GtkActionGroup             *action_group,
 							  gboolean                    visible);
+GtkAccelGroup  *gtk_action_group_get_accel_group         (GtkActionGroup             *action_group) GDK_AVAILABLE_IN_3_6;
+void            gtk_action_group_set_accel_group         (GtkActionGroup             *action_group,
+                                                          GtkAccelGroup              *accel_group) GDK_AVAILABLE_IN_3_6;
 GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
 							  const gchar                *action_name);
 GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 5a916da..8267646 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1133,6 +1133,7 @@ gtk_menu_item_sync_action_properties (GtkActivatable *activatable,
 
   if (priv->use_action_appearance)
     {
+      GClosure *accel;
       label = gtk_bin_get_child (GTK_BIN (menu_item));
 
       /* make sure label is a label, deleting it otherwise */
@@ -1148,11 +1149,13 @@ gtk_menu_item_sync_action_properties (GtkActivatable *activatable,
       /* Make label point to the menu_item's label */
       label = gtk_bin_get_child (GTK_BIN (menu_item));
 
-      if (GTK_IS_ACCEL_LABEL (label) && gtk_action_get_accel_path (action))
+      if (GTK_IS_ACCEL_LABEL (label) &&
+          gtk_action_get_accel_path (action) &&
+          (accel = gtk_action_get_accel_closure (action)) &&
+          gtk_accel_group_from_accel_closure (accel))
         {
           gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), NULL);
-          gtk_accel_label_set_accel_closure (GTK_ACCEL_LABEL (label),
-                                             gtk_action_get_accel_closure (action));
+          gtk_accel_label_set_accel_closure (GTK_ACCEL_LABEL (label), accel);
         }
 
       activatable_update_label (menu_item, action);
