Update to version 2.33.1

[profile/ivi/glib2.git] / gio / gactionmap.c

diff --git a/gio/gactionmap.c b/gio/gactionmap.c
index 67feec8..3d4c481 100644 (file)
--- a/gio/gactionmap.c
+++ b/gio/gactionmap.c
@@ -101,8 +101,7 @@ void
 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);
 }
 
 /**
@@ -120,8 +119,7 @@ void
 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);
 }
 
 /**
@@ -223,7 +221,7 @@ g_action_map_add_action_entries (GActionMap         *action_map,
         {
           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.",
@@ -244,7 +242,7 @@ g_action_map_add_action_entries (GActionMap         *action_map,
           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);