projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdbus-tool: simplify some logic
[platform/upstream/glib.git]
/
gio
/
gsimpleactiongroup.h
diff --git
a/gio/gsimpleactiongroup.h
b/gio/gsimpleactiongroup.h
index
2637a47
..
4cca76b
100644
(file)
--- 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
* 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>
*/
*
* 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
#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 "gactiongroup.h"
+#include "gactionmap.h"
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-50,12
+49,12
@@
typedef struct _GSimpleActionGroupClass GSimpleActionGroupCl
*
* The #GSimpleActionGroup structure contains private data and should only be accessed using the provided API.
*
*
* The #GSimpleActionGroup structure contains private data and should only be accessed using the provided API.
*
- * Since: 2.2
6
+ * Since: 2.2
8
*/
struct _GSimpleActionGroup
{
/*< private >*/
*/
struct _GSimpleActionGroup
{
/*< private >*/
- G
ActionGroup
parent_instance;
+ G
Object
parent_instance;
GSimpleActionGroupPrivate *priv;
};
GSimpleActionGroupPrivate *priv;
};
@@
-63,28
+62,35
@@
struct _GSimpleActionGroup
struct _GSimpleActionGroupClass
{
/*< private >*/
struct _GSimpleActionGroupClass
{
/*< private >*/
- G
ActionGroup
Class parent_class;
+ G
Object
Class parent_class;
/*< private >*/
gpointer padding[12];
};
/*< private >*/
gpointer padding[12];
};
+GLIB_AVAILABLE_IN_ALL
GType g_simple_action_group_get_type (void) G_GNUC_CONST;
GType g_simple_action_group_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
GSimpleActionGroup * g_simple_action_group_new (void);
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);
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);
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);
void g_simple_action_group_remove (GSimpleActionGroup *simple,
const gchar *action_name);
-void g_simple_action_group_set_enabled (GSimpleActionGroup *simple,
- const gchar *action_name,
- gboolean enabled);
+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
G_END_DECLS