X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgsimpleactiongroup.h;h=4cca76b33682ac4255834c4abb098d2e66691a5b;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=14d60c4fee7e94b361bb234b9037a661d4087a3b;hpb=63adeda0861a26b38ec0adc76255666554c18951;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gsimpleactiongroup.h b/gio/gsimpleactiongroup.h
index 14d60c4..4cca76b 100644
--- a/gio/gsimpleactiongroup.h
+++ b/gio/gsimpleactiongroup.h
@@ -12,21 +12,20 @@
  * 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 <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt@desrt.ca>
  */
 
+#ifndef __G_SIMPLE_ACTION_GROUP_H__
+#define __G_SIMPLE_ACTION_GROUP_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SIMPLE_ACTION_GROUP_H__
-#define __G_SIMPLE_ACTION_GROUP_H__
-
 #include "gactiongroup.h"
+#include "gactionmap.h"
 
 G_BEGIN_DECLS
 
@@ -50,7 +49,7 @@ typedef struct _GSimpleActionGroupClass                     GSimpleActionGroupCl
  *
  * The #GSimpleActionGroup structure contains private data and should only be accessed using the provided API.
  *
- * Since: 2.26
+ * Since: 2.28
  */
 struct _GSimpleActionGroup
 {
@@ -69,19 +68,30 @@ struct _GSimpleActionGroupClass
   gpointer padding[12];
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType                   g_simple_action_group_get_type                  (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 GSimpleActionGroup *    g_simple_action_group_new                       (void);
 
+GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_lookup_action)
 GAction *               g_simple_action_group_lookup                    (GSimpleActionGroup *simple,
                                                                          const gchar        *action_name);
 
+GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action)
 void                    g_simple_action_group_insert                    (GSimpleActionGroup *simple,
                                                                          GAction            *action);
 
+GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_remove_action)
 void                    g_simple_action_group_remove                    (GSimpleActionGroup *simple,
                                                                          const gchar        *action_name);
 
+GLIB_DEPRECATED_IN_2_38_FOR (g_action_map_add_action_entries)
+void                    g_simple_action_group_add_entries               (GSimpleActionGroup *simple,
+                                                                         const GActionEntry *entries,
+                                                                         gint                n_entries,
+                                                                         gpointer            user_data);
+
 G_END_DECLS
 
 #endif /* __G_SIMPLE_ACTION_GROUP_H__ */