#include "config.h"
#include "gsimpleaction.h"
-#include "gactiongroup.h"
#include "gactionmap.h"
#include "gaction.h"
* Since: 2.32
**/
-G_DEFINE_INTERFACE (GActionMap, g_action_map, G_TYPE_ACTION_GROUP)
+G_DEFINE_INTERFACE (GActionMap, g_action_map, G_TYPE_OBJECT)
static void
g_action_map_default_init (GActionMapInterface *iface)
g_action_map_add_action (GActionMap *action_map,
GAction *action)
{
- return G_ACTION_MAP_GET_IFACE (action_map)
- ->add_action (action_map, action);
+ G_ACTION_MAP_GET_IFACE (action_map)->add_action (action_map, action);
}
/**
g_action_map_remove_action (GActionMap *action_map,
const gchar *action_name)
{
- return G_ACTION_MAP_GET_IFACE (action_map)
- ->remove_action (action_map, action_name);
+ G_ACTION_MAP_GET_IFACE (action_map)->remove_action (action_map, action_name);
}
/**
/**
* g_action_map_add_action_entries:
* @action_map: a #GActionMap
- * @entries: a pointer to the first item in an array of #GActionEntry
- * structs
+ * @entries: (array length=n_entries) (element-type GActionEntry): a pointer to
+ * the first item in an array of #GActionEntry structs
* @n_entries: the length of @entries, or -1 if @entries is %NULL-terminated
* @user_data: the user data for signal connections
*
{
if (!g_variant_type_string_is_valid (entry->parameter_type))
{
- g_critical ("g_simple_action_group_add_entries: the type "
+ g_critical ("g_action_map_add_entries: the type "
"string '%s' given as the parameter type for "
"action '%s' is not a valid GVariant type "
"string. This action will not be added.",
state = g_variant_parse (NULL, entry->state, NULL, NULL, &error);
if (state == NULL)
{
- g_critical ("g_simple_action_group_add_entries: GVariant could "
+ g_critical ("g_action_map_add_entries: GVariant could "
"not parse the state value given for action '%s' "
"('%s'): %s. This action will not be added.",
entry->name, entry->state, error->message);