X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgsimpleactiongroup.c;h=c5422511c77e5732056e2045298db3e7cddfe5d8;hb=d9ad40b4eaf1a9197ab363de4346a8d84f45f5c1;hp=ec991beddeaca97d4c65a429b1afbd6c3a5539ea;hpb=76527e5cd5e864f1695b3afe0d6350e7546606bb;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gsimpleactiongroup.c b/gio/gsimpleactiongroup.c
index ec991be..c542251 100644
--- a/gio/gsimpleactiongroup.c
+++ b/gio/gsimpleactiongroup.c
@@ -12,13 +12,13 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Authors: Ryan Lortie
*/
+#include "config.h"
+
#include "gsimpleactiongroup.h"
#include "gsimpleaction.h"
@@ -29,9 +29,10 @@
* SECTION:gsimpleactiongroup
* @title: GSimpleActionGroup
* @short_description: A simple GActionGroup implementation
+ * @include: gio/gio.h
*
* #GSimpleActionGroup is a hash table filled with #GAction objects,
- * implementing the #GActionGroup interface.
+ * implementing the #GActionGroup and #GActionMap interfaces.
**/
struct _GSimpleActionGroupPrivate
@@ -43,10 +44,11 @@ static void g_simple_action_group_iface_init (GActionGroupInterface *);
static void g_simple_action_group_map_iface_init (GActionMapInterface *);
G_DEFINE_TYPE_WITH_CODE (GSimpleActionGroup,
g_simple_action_group, G_TYPE_OBJECT,
+ G_ADD_PRIVATE (GSimpleActionGroup)
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
- g_simple_action_group_iface_init);
+ g_simple_action_group_iface_init);
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_MAP,
- g_simple_action_group_map_iface_init))
+ g_simple_action_group_map_iface_init))
static gchar **
g_simple_action_group_list_actions (GActionGroup *group)
@@ -249,9 +251,7 @@ g_simple_action_group_finalize (GObject *object)
static void
g_simple_action_group_init (GSimpleActionGroup *simple)
{
- simple->priv = G_TYPE_INSTANCE_GET_PRIVATE (simple,
- G_TYPE_SIMPLE_ACTION_GROUP,
- GSimpleActionGroupPrivate);
+ simple->priv = g_simple_action_group_get_instance_private (simple);
simple->priv->table = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_object_unref);
}
@@ -262,8 +262,6 @@ g_simple_action_group_class_init (GSimpleActionGroupClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->finalize = g_simple_action_group_finalize;
-
- g_type_class_add_private (class, sizeof (GSimpleActionGroupPrivate));
}
static void
@@ -310,7 +308,9 @@ g_simple_action_group_new (void)
* Returns: (transfer none): a #GAction, or %NULL
*
* Since: 2.28
- **/
+ *
+ * Deprecated: 2.38: Use g_action_map_lookup_action()
+ */
GAction *
g_simple_action_group_lookup (GSimpleActionGroup *simple,
const gchar *action_name)
@@ -333,6 +333,8 @@ g_simple_action_group_lookup (GSimpleActionGroup *simple,
* The action group takes its own reference on @action.
*
* Since: 2.28
+ *
+ * Deprecated: 2.38: Use g_action_map_add_action()
**/
void
g_simple_action_group_insert (GSimpleActionGroup *simple,
@@ -353,6 +355,8 @@ g_simple_action_group_insert (GSimpleActionGroup *simple,
* If no action of this name is in the group then nothing happens.
*
* Since: 2.28
+ *
+ * Deprecated: 2.38: Use g_action_map_remove_action()
**/
void
g_simple_action_group_remove (GSimpleActionGroup *simple,
@@ -367,8 +371,8 @@ g_simple_action_group_remove (GSimpleActionGroup *simple,
/**
* g_simple_action_group_add_entries:
* @simple: a #GSimpleActionGroup
- * @entries: a pointer to the first item in an array of #GActionEntry
- * structs
+ * @entries: (array length=n_entries): a pointer to the first item in
+ * an array of #GActionEntry structs
* @n_entries: the length of @entries, or -1
* @user_data: the user data for signal connections
*
@@ -376,6 +380,8 @@ g_simple_action_group_remove (GSimpleActionGroup *simple,
* and adding them to the action group.
*
* Since: 2.30
+ *
+ * Deprecated: 2.38: Use g_action_map_add_action_entries()
**/
void
g_simple_action_group_add_entries (GSimpleActionGroup *simple,