From 2064987e319d2cf6b49b3939bcb8ae895dba3632 Mon Sep 17 00:00:00 2001
From: Juan Pablo Ugarte <juanpablougarte@gmail.com>
Date: Thu, 13 Sep 2012 16:00:32 -0300
Subject: [PATCH] Added GtkActionGroup:accel-group property. Fixes bug #671786
 "Glade XML files cannot set an ImageMenuItem accelerator key from an Action"

---
 gtk/gtkactiongroup.c | 82 +++++++++++++++++++++++++++++++++++++++++++-
 gtk/gtkactiongroup.h |  6 ++++
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 5e94658448..ac177e1ab3 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 the actions of this group should use."),
+							GTK_TYPE_ACCEL_GROUP,
+							GTK_PARAM_READWRITE));
 
   /**
    * GtkActionGroup::connect-proxy:
@@ -555,6 +564,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 +598,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 +630,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 +762,25 @@ gtk_action_group_get_visible (GtkActionGroup *action_group)
   return private->visible;
 }
 
+/**
+ * gtk_action_group_get_accel_group:
+ * @action_group: a #GtkActionGroup
+ *
+ * Gets the accelerator group.
+ * 
+ * Returns: (transfer none): the accelerator group associated with this action
+ * group or %NULL if there is none.
+ *
+ * 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)
@@ -784,6 +820,47 @@ gtk_action_group_set_visible (GtkActionGroup *action_group,
     }
 }
 
+static void 
+gtk_action_group_accel_group_foreach (gpointer key, gpointer val, gpointer data)
+{
+  gtk_action_set_accel_group (val, data);
+}
+
+/**
+ * gtk_action_group_set_accel_group:
+ * @action_group: a #GtkActionGroup
+ * @accel_group: (allow-none): a #GtkAccelGroup to set or %NULL
+ *
+ * Sets the accelerator group to be used by every action in this group.
+ * 
+ * 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);
+
+  if (accel_group)
+    private->accel_group = g_object_ref (accel_group);
+
+  /* Set the new accel group on every action */
+  g_hash_table_foreach (private->actions,
+                        gtk_action_group_accel_group_foreach,
+                        accel_group);
+
+  g_object_notify (G_OBJECT (action_group), "accel-group");
+}
+
 /**
  * gtk_action_group_get_action:
  * @action_group: the action group
@@ -861,6 +938,9 @@ gtk_action_group_add_action (GtkActionGroup *action_group,
 		       (gpointer) name,
                        g_object_ref (action));
   g_object_set (action, I_("action-group"), action_group, NULL);
+  
+  if (private->accel_group)
+    gtk_action_set_accel_group (action, private->accel_group);
 }
 
 /**
diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h
index 5f1658acd0..97ac90369f 100644
--- a/gtk/gtkactiongroup.h
+++ b/gtk/gtkactiongroup.h
@@ -165,6 +165,12 @@ 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);
+GDK_AVAILABLE_IN_3_6
+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);
+
 GtkAction      *gtk_action_group_get_action              (GtkActionGroup             *action_group,
 							  const gchar                *action_name);
 GList          *gtk_action_group_list_actions            (GtkActionGroup             *action_group);