hook gvariant vectors up to kdbus

[platform/upstream/glib.git] / gio / gaction.h

diff --git a/gio/gaction.h b/gio/gaction.h
index 68d4b65..1fefd3e 100644 (file)
--- a/gio/gaction.h
+++ b/gio/gaction.h
@@ -12,20 +12,18 @@
  * 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_ACTION_H__
+#define __G_ACTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ACTION_H__
-#define __G_ACTION_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
@@ -33,88 +31,68 @@ G_BEGIN_DECLS
 #define G_TYPE_ACTION                                       (g_action_get_type ())
 #define G_ACTION(inst)                                      (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
                                                              G_TYPE_ACTION, GAction))
-#define G_ACTION_CLASS(class)                               (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_ACTION, GActionClass))
 #define G_IS_ACTION(inst)                                   (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_ACTION))
-#define G_IS_ACTION_CLASS(class)                            (G_TYPE_CHECK_CLASS_TYPE ((class), G_TYPE_ACTION))
-#define G_ACTION_GET_CLASS(inst)                            (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_ACTION, GActionClass))
+#define G_ACTION_GET_IFACE(inst)                            (G_TYPE_INSTANCE_GET_INTERFACE ((inst),                  \
+                                                             G_TYPE_ACTION, GActionInterface))
 
-typedef struct _GActionPrivate                              GActionPrivate;
-typedef struct _GActionClass                                GActionClass;
+typedef struct _GActionInterface                            GActionInterface;
 
-/**
- * GAction:
- *
- * The <structname>GAction</structname> structure contains private
- * data and should only be accessed using the provided API
- *
- * Since: 2.26
- */
-struct _GAction
+struct _GActionInterface
 {
-  /*< private >*/
-  GObject parent_instance;
-
-  GActionPrivate *priv;
-};
+  GTypeInterface g_iface;
 
-/**
- * GActionClass:
- * @get_state_hint: the virtual function pointer for g_action_get_state_hint()
- * @set_state: the virtual function pointer for g_action_set_state().  The implementation should check the value
- *             for validity and then chain up to the handler in the base class in order to actually update the
- *             state.
- * @activate: the class closure for the activate signal
- *
- * Since: 2.26
- */
-struct _GActionClass
-{
-  GObjectClass parent_class;
-
-  /*< public >*/
   /* virtual functions */
+  const gchar *        (* get_name)             (GAction  *action);
+  const GVariantType * (* get_parameter_type)   (GAction  *action);
+  const GVariantType * (* get_state_type)       (GAction  *action);
   GVariant *           (* get_state_hint)       (GAction  *action);
-  void                 (* set_state)            (GAction  *action,
-                                                 GVariant *state);
 
-  /*< private >*/
-  gpointer vfunc_padding[6];
+  gboolean             (* get_enabled)          (GAction  *action);
+  GVariant *           (* get_state)            (GAction  *action);
 
-  /*< public >*/
-  /* signals */
+  void                 (* change_state)         (GAction  *action,
+                                                 GVariant *value);
   void                 (* activate)             (GAction  *action,
                                                  GVariant *parameter);
-
-  /*< private >*/
-  gpointer signal_padding[6];
 };
 
+GLIB_AVAILABLE_IN_2_30
 GType                   g_action_get_type                               (void) G_GNUC_CONST;
 
-GAction *               g_action_new                                    (const gchar        *name,
-                                                                         const GVariantType *parameter_type);
-
-GAction *               g_action_new_stateful                           (const gchar        *name,
-                                                                         const GVariantType *parameter_type,
-                                                                         GVariant           *state);
-
+GLIB_AVAILABLE_IN_ALL
 const gchar *           g_action_get_name                               (GAction            *action);
+GLIB_AVAILABLE_IN_ALL
 const GVariantType *    g_action_get_parameter_type                     (GAction            *action);
+GLIB_AVAILABLE_IN_ALL
 const GVariantType *    g_action_get_state_type                         (GAction            *action);
+GLIB_AVAILABLE_IN_ALL
 GVariant *              g_action_get_state_hint                         (GAction            *action);
 
+GLIB_AVAILABLE_IN_ALL
 gboolean                g_action_get_enabled                            (GAction            *action);
-void                    g_action_set_enabled                            (GAction            *action,
-                                                                         gboolean            enabled);
-
+GLIB_AVAILABLE_IN_ALL
 GVariant *              g_action_get_state                              (GAction            *action);
-void                    g_action_set_state                              (GAction            *action,
-                                                                         GVariant           *value);
 
+GLIB_AVAILABLE_IN_ALL
+void                    g_action_change_state                           (GAction            *action,
+                                                                         GVariant           *value);
+GLIB_AVAILABLE_IN_ALL
 void                    g_action_activate                               (GAction            *action,
                                                                          GVariant           *parameter);
+
+GLIB_AVAILABLE_IN_2_28
+gboolean                g_action_name_is_valid                          (const gchar        *action_name);
+
+GLIB_AVAILABLE_IN_2_38
+gboolean                g_action_parse_detailed_name                    (const gchar        *detailed_name,
+                                                                         gchar             **action_name,
+                                                                         GVariant          **target_value,
+                                                                         GError            **error);
+
+GLIB_AVAILABLE_IN_2_38
+gchar *                 g_action_print_detailed_name                    (const gchar        *action_name,
+                                                                         GVariant           *target_value);
+
 G_END_DECLS
 
 #endif /* __G_ACTION_H__ */