diff options
author | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-09-20 17:36:17 -0400 |
---|---|---|
committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-09-20 17:46:56 -0400 |
commit | 00491f06c3080f14536b6aa00251055c6c584c21 (patch) | |
tree | 48cba016a15f95e41c926861df07502cb82d4c06 | |
parent | eea80f82e0cc7c2a8d8d2d34984d75bcfa83368d (diff) | |
download | glibmm-00491f06c3080f14536b6aa00251055c6c584c21.tar.gz |
giomm: Add Action class wrapping GAction.
* gio/src/action.{ccg,hg}:
* gio/src/filelist.am: Add the new sources wrapping the methods and
signals of GAction and include them in the list of files to be built.
* tools/extra_defs_gen/generate_defs_gio.cc: Add G_TYPE_ACTION to
the list of types for which signals and properties should be
generated.
* gio/src/gio_signals.defs:
* gio/src/gio_methods.defs: Regenerate to get the new methods and
properties being wrapped.
* gio/src/gio_extra_objects.defs: Add Action to the list of extra
objects so gmmproc's documentation generation does not produce
warnings because of it. Also added DBusNodeInfo and Proxy.
* tools/m4/convert_gio.m4: Alphabetized the conversion by groups
pertaining to types. Removed the Variant return conversions which
take copies.
* glib/src/variant.hg: Moved the conversions here because they are
specific to the methods in this class, specifically get_child() and
get().
-rw-r--r-- | ChangeLog | 26 | ||||
-rw-r--r-- | gio/src/action.ccg | 25 | ||||
-rw-r--r-- | gio/src/action.hg | 89 | ||||
-rw-r--r-- | gio/src/filelist.am | 1 | ||||
-rw-r--r-- | gio/src/gio_extra_objects.defs | 31 | ||||
-rw-r--r-- | gio/src/gio_methods.defs | 1223 | ||||
-rw-r--r-- | gio/src/gio_signals.defs | 55 | ||||
-rw-r--r-- | glib/src/variant.hg | 2 | ||||
-rw-r--r-- | tools/extra_defs_gen/generate_defs_gio.cc | 1 | ||||
-rw-r--r-- | tools/m4/convert_gio.m4 | 16 |
10 files changed, 916 insertions, 553 deletions
@@ -1,3 +1,29 @@ +2011-09-20 José Alburquerque <jaalburqu@svn.gnome.org> + + giomm: Add Action class wrapping GAction. + + * gio/src/action.{ccg,hg}: + * gio/src/filelist.am: Add the new sources wrapping the methods and + signals of GAction and include them in the list of files to be built. + + * tools/extra_defs_gen/generate_defs_gio.cc: Add G_TYPE_ACTION to + the list of types for which signals and properties should be + generated. + * gio/src/gio_signals.defs: + * gio/src/gio_methods.defs: Regenerate to get the new methods and + properties being wrapped. + + * gio/src/gio_extra_objects.defs: Add Action to the list of extra + objects so gmmproc's documentation generation does not produce + warnings because of it. Also added DBusNodeInfo and Proxy. + + * tools/m4/convert_gio.m4: Alphabetized the conversion by groups + pertaining to types. Removed the Variant return conversions which + take copies. + * glib/src/variant.hg: Moved the conversions here because they are + specific to the methods in this class, specifically get_child() and + get(). + 2011-09-17 José Alburquerque <jaalburqu@svn.gnome.org> gmmproc: DocParser: Correct the removal of link tags. diff --git a/gio/src/action.ccg b/gio/src/action.ccg new file mode 100644 index 00000000..c8c78857 --- /dev/null +++ b/gio/src/action.ccg @@ -0,0 +1,25 @@ +// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*- + +/* Copyright (C) 2011 The giomm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <gio/gio.h> + +namespace Gio +{ + +} // namespace Gio diff --git a/gio/src/action.hg b/gio/src/action.hg new file mode 100644 index 00000000..e8d9e4d2 --- /dev/null +++ b/gio/src/action.hg @@ -0,0 +1,89 @@ +// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*- + +/* Copyright (C) 2011 The giomm Development Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <glibmm/interface.h> +#include <glibmm/varianttype.h> + +_DEFS(giomm,gio) +_PINCLUDE(glibmm/private/interface_p.h) +_PINCLUDE(gio/gio.h) + +#ifndef DOXYGEN_SHOULD_SKIP_THIS +typedef struct _GActionInterface GActionInterface; +#endif /* DOXYGEN_SHOULD_SKIP_THIS */ + +namespace Gio +{ + +/** Action - An action. + * Action represents a single named action. + * + * The main interface to an action is that it can be activated with activate(). + * This results in the signal_activate() signal being emitted. An activation + * has a Glib::VariantBase parameter (which may be <tt>0</tt>). The correct + * type for the parameter is determined by a static parameter type (which is + * given at construction time). + * + * An action may optionally have a state, in which case the state may be set + * with change_state(). This call takes a Glib::VariantBase. The correct type + * for the state is determined by a static state type (which is given at + * construction time). + * + * The state may have a hint associated with it, specifying its valid range. + * + * Action is merely the interface to the concept of an action, as described + * above. Various implementations of actions exist, including SimpleAction and + * Gtk::Action. + * + * In all cases, the implementing class is responsible for storing the name of + * the action, the parameter type, the enabled state, the optional state type + * and the state and emitting the appropriate signals when these change. The + * implementor responsible for filtering calls to activate() and change_state() + * for type safety and for the state being enabled. + * + * Probably the only useful thing to do with a Action is to put it inside of a + * SimpleActionGroup. + * + * @newin{2,30} + */ +class Action : public Glib::Interface +{ + _CLASS_INTERFACE(Action, GAction, G_ACTION, GActionInterface) + +public: + _WRAP_METHOD(Glib::ustring get_name() const, g_action_get_name) + _WRAP_METHOD(Glib::VariantType get_parameter_type() const, g_action_get_parameter_type) + _WRAP_METHOD(Glib::VariantType get_state_type() const, g_action_get_state_type) + _WRAP_METHOD(void get_state_hint() const, g_action_get_state_hint) + _WRAP_METHOD(bool get_enabled() const, g_action_get_enabled) + _WRAP_METHOD(void get_state() const, g_action_get_state) + + _WRAP_METHOD(void change_state(const Glib::VariantBase& value), g_action_change_state) + _WRAP_METHOD(void activate(const Glib::VariantBase& parameter), g_action_activate) + + _WRAP_PROPERTY("enabled", bool) + _WRAP_PROPERTY("name", Glib::ustring) + _WRAP_PROPERTY("parameter-type", Glib::VariantType) + _WRAP_PROPERTY("state", Glib::VariantBase) + _WRAP_PROPERTY("state-type", Glib::VariantType) + +//TODO: Wrap virtual functions. +}; + +} // namespace Gio diff --git a/gio/src/filelist.am b/gio/src/filelist.am index 595081c3..371a0f3a 100644 --- a/gio/src/filelist.am +++ b/gio/src/filelist.am @@ -13,6 +13,7 @@ giomm_files_defs = \ gio_docs_override.xml giomm_files_any_hg = \ + action.hg \ actiongroup.hg \ appinfo.hg \ application.hg \ diff --git a/gio/src/gio_extra_objects.defs b/gio/src/gio_extra_objects.defs index b3bbbc0a..6d1f5e53 100644 --- a/gio/src/gio_extra_objects.defs +++ b/gio/src/gio_extra_objects.defs @@ -6,6 +6,12 @@ ; that are mentioned in documentation text. ; (DocsParser.pm:substitute_function(), which uses GtkDefs.pm:lookup_object().) +(define-object Action + (in-module "GLib") + (c-name "GAction") + (gtype-id "G_TYPE_ACTION") +) + (define-object DBusConnection (in-module "GLib") (c-name "GDBusConnection") @@ -32,7 +38,6 @@ (gtype-id "G_TYPE_DBUS_MESSAGE") ) - (define-object DBusMethodInvocation (in-module "GLib") (c-name "GDBusMethodInvocation") @@ -46,6 +51,19 @@ (gtype-id "G_TYPE_DBUS_METHOD_INVOCATION") ) +(define-object DBusNodeInfo + (in-module "GLib") + (c-name "GDBusNodeInfo") + (gtype-id "G_TYPE_DBUS_NODE_INFO") +) + +; This helps DocParser.pm, which can't always guess how to break the "DB" part. +(define-object DbusNodeInfo + (in-module "GLib") + (c-name "GDBusNodeInfo") + (gtype-id "G_TYPE_DBUS_NODE_INFO") +) + (define-object DBusProxy (in-module "GLib") (c-name "GDBusProxy") @@ -96,3 +114,14 @@ (gtype-id "G_TYPE_FILE_INFO") ) +(define-object Proxy + (in-module "GLib") + (c-name "GProxy") + (gtype-id "G_TYPE_PROXY") +) + +(define-object ProxyResolver + (in-module "GLib") + (c-name "GProxyResolver") + (gtype-id "G_TYPE_PROXY_RESOLVER") +) diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs index c3e7e0ab..ec93d971 100644 --- a/gio/src/gio_methods.defs +++ b/gio/src/gio_methods.defs @@ -1,23 +1,5 @@ ;; -*- scheme -*- ; object definitions ... -(define-object Animal - (in-module "Example") - (c-name "ExampleAnimal") - (gtype-id "EXAMPLE_TYPE_ANIMAL") -) - -(define-object Cat - (in-module "Example") - (c-name "ExampleCat") - (gtype-id "EXAMPLE_TYPE_CAT") -) - -(define-object Object - (in-module "Example") - (c-name "ExampleObject") - (gtype-id "EXAMPLE_TYPE_OBJECT") -) - (define-object Info (in-module "GApp") (c-name "GAppInfo") @@ -118,20 +100,6 @@ (gtype-id "G_TYPE_D_BUS_INTERFACE_SKELETON") ) -(define-object CatSkeleton - (in-module "Example") - (parent "GDBusInterfaceSkeleton") - (c-name "ExampleCatSkeleton") - (gtype-id "EXAMPLE_TYPE_CAT_SKELETON") -) - -(define-object AnimalSkeleton - (in-module "Example") - (parent "GDBusInterfaceSkeleton") - (c-name "ExampleAnimalSkeleton") - (gtype-id "EXAMPLE_TYPE_ANIMAL_SKELETON") -) - (define-object Object (in-module "GDBus") (c-name "GDBusObject") @@ -151,13 +119,6 @@ (gtype-id "G_TYPE_D_BUS_OBJECT_MANAGER_CLIENT") ) -(define-object ObjectManagerClient - (in-module "Example") - (parent "GDBusObjectManagerClient") - (c-name "ExampleObjectManagerClient") - (gtype-id "EXAMPLE_TYPE_OBJECT_MANAGER_CLIENT") -) - (define-object ObjectManagerServer (in-module "GDBus") (parent "GObject") @@ -172,13 +133,6 @@ (gtype-id "G_TYPE_D_BUS_OBJECT_PROXY") ) -(define-object ObjectProxy - (in-module "Example") - (parent "GDBusObjectProxy") - (c-name "ExampleObjectProxy") - (gtype-id "EXAMPLE_TYPE_OBJECT_PROXY") -) - (define-object ObjectSkeleton (in-module "GDBus") (parent "GObject") @@ -186,13 +140,6 @@ (gtype-id "G_TYPE_D_BUS_OBJECT_SKELETON") ) -(define-object ObjectSkeleton - (in-module "Example") - (parent "GDBusObjectSkeleton") - (c-name "ExampleObjectSkeleton") - (gtype-id "EXAMPLE_TYPE_OBJECT_SKELETON") -) - (define-object Proxy (in-module "GDBus") (parent "GObject") @@ -200,20 +147,6 @@ (gtype-id "G_TYPE_D_BUS_PROXY") ) -(define-object CatProxy - (in-module "Example") - (parent "GDBusProxy") - (c-name "ExampleCatProxy") - (gtype-id "EXAMPLE_TYPE_CAT_PROXY") -) - -(define-object AnimalProxy - (in-module "Example") - (parent "GDBusProxy") - (c-name "ExampleAnimalProxy") - (gtype-id "EXAMPLE_TYPE_ANIMAL_PROXY") -) - (define-object AppInfoLookup (in-module "GDesktop") (c-name "GDesktopAppInfoLookup") @@ -506,13 +439,6 @@ (gtype-id "G_TYPE_SETTINGS_SCHEMA") ) -(define-object Action - (in-module "GSimple") - (parent "GObject") - (c-name "GSimpleAction") - (gtype-id "G_TYPE_SIMPLE_ACTION") -) - (define-object ActionGroup (in-module "GSimple") (parent "GObject") @@ -638,6 +564,13 @@ (gtype-id "G_TYPE_TCP_WRAPPER_CONNECTION") ) +(define-object Resolver + (in-module "GThreaded") + (parent "GResolver") + (c-name "GThreadedResolver") + (gtype-id "G_TYPE_THREADED_RESOLVER") +) + (define-object SocketService (in-module "GThreaded") (parent "GSocketService") @@ -659,6 +592,27 @@ (gtype-id "G_TYPE_TLS_CONNECTION") ) +(define-object Database + (in-module "GTls") + (parent "GObject") + (c-name "GTlsDatabase") + (gtype-id "G_TYPE_TLS_DATABASE") +) + +(define-object Interaction + (in-module "GTls") + (parent "GObject") + (c-name "GTlsInteraction") + (gtype-id "G_TYPE_TLS_INTERACTION") +) + +(define-object Password + (in-module "GTls") + (parent "GObject") + (c-name "GTlsPassword") + (gtype-id "G_TYPE_TLS_PASSWORD") +) + (define-object Connection (in-module "GUnix") (parent "GSocketConnection") @@ -701,6 +655,13 @@ (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM") ) +(define-object Resolver + (in-module "GUnix") + (parent "GThreadedResolver") + (c-name "GUnixResolver") + (gtype-id "G_TYPE_UNIX_RESOLVER") +) + (define-object SocketAddress (in-module "GUnix") (parent "GSocketAddress") @@ -749,6 +710,13 @@ (gtype-id "G_TYPE_WIN32_OUTPUT_STREAM") ) +(define-object 32Resolver + (in-module "GWin") + (parent "GThreadedResolver") + (c-name "GWin32Resolver") + (gtype-id "G_TYPE_WIN32_RESOLVER") +) + ;; Enumerations and flags ... (define-enum AuthMechanismState @@ -1130,10 +1098,10 @@ (c-name "GSocketFamily") (gtype-id "G_TYPE_SOCKET_FAMILY") (values - '("g-socket-family-invalid" "G_SOCKET_FAMILY_INVALID") - '("#ifdef" "#ifdef") - '("#endif" "#endif") - '("g-socket-family-ipv6" "G_SOCKET_FAMILY_IPV6") + '("invalid" "G_SOCKET_FAMILY_INVALID") + '("unix" "G_SOCKET_FAMILY_UNIX") + '("ipv4" "G_SOCKET_FAMILY_IPV4") + '("ipv6" "G_SOCKET_FAMILY_IPV6") ) ) @@ -1510,6 +1478,17 @@ ) ) +(define-enum InteractionResult + (in-module "GTls") + (c-name "GTlsInteractionResult") + (gtype-id "G_TYPE_TLS_INTERACTION_RESULT") + (values + '("unhandled" "G_TLS_INTERACTION_UNHANDLED") + '("handled" "G_TLS_INTERACTION_HANDLED") + '("failed" "G_TLS_INTERACTION_FAILED") + ) +) + (define-flags InterfaceSkeletonFlags (in-module "GDBus") (c-name "GDBusInterfaceSkeletonFlags") @@ -1530,6 +1509,35 @@ ) ) +(define-enum DatabaseVerifyFlags + (in-module "GTls") + (c-name "GTlsDatabaseVerifyFlags") + (gtype-id "G_TYPE_TLS_DATABASE_VERIFY_FLAGS") + (values + '("none" "G_TLS_DATABASE_VERIFY_NONE") + ) +) + +(define-enum DatabaseLookupFlags + (in-module "GTls") + (c-name "GTlsDatabaseLookupFlags") + (gtype-id "G_TYPE_TLS_DATABASE_LOOKUP_FLAGS") + (values + '("none" "G_TLS_DATABASE_LOOKUP_NONE") + '("keypair" "G_TLS_DATABASE_LOOKUP_KEYPAIR") + ) +) + +(define-enum ScopeFlags + (in-module "GIOModule") + (c-name "GIOModuleScopeFlags") + (gtype-id "G_TYPE_IO_MODULE_SCOPE_FLAGS") + (values + '("none" "G_IO_MODULE_SCOPE_NONE") + '("block-duplicates" "G_IO_MODULE_SCOPE_BLOCK_DUPLICATES") + ) +) + (define-flags BindFlags (in-module "GSettings") (c-name "GSettingsBindFlags") @@ -1715,9 +1723,9 @@ (return-type "GVariant*") ) -(define-method set_state +(define-method change_state (of-object "GAction") - (c-name "g_action_set_state") + (c-name "g_action_change_state") (return-type "none") (parameters '("GVariant*" "value") @@ -3048,6 +3056,17 @@ ) ) +(define-method read_line_utf8 + (of-object "GDataInputStream") + (c-name "g_data_input_stream_read_line_utf8") + (return-type "char*") + (parameters + '("gsize*" "length") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + (define-method read_line_async (of-object "GDataInputStream") (c-name "g_data_input_stream_read_line_async") @@ -3071,6 +3090,17 @@ ) ) +(define-method read_line_finish_utf8 + (of-object "GDataInputStream") + (c-name "g_data_input_stream_read_line_finish_utf8") + (return-type "char*") + (parameters + '("GAsyncResult*" "result") + '("gsize*" "length") + '("GError**" "error") + ) +) + (define-method read_until (of-object "GDataInputStream") (c-name "g_data_input_stream_read_until") @@ -3714,6 +3744,57 @@ ) ) +(define-method call_with_unix_fd_list + (of-object "GDBusConnection") + (c-name "g_dbus_connection_call_with_unix_fd_list") + (return-type "none") + (parameters + '("const-gchar*" "bus_name") + '("const-gchar*" "object_path") + '("const-gchar*" "interface_name") + '("const-gchar*" "method_name") + '("GVariant*" "parameters") + '("const-GVariantType*" "reply_type") + '("GDBusCallFlags" "flags") + '("gint" "timeout_msec") + '("GUnixFDList*" "fd_list") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method call_with_unix_fd_list_finish + (of-object "GDBusConnection") + (c-name "g_dbus_connection_call_with_unix_fd_list_finish") + (return-type "GVariant*") + (parameters + '("GUnixFDList**" "out_fd_list") + '("GAsyncResult*" "res") + '("GError**" "error") + ) +) + +(define-method call_with_unix_fd_list_sync + (of-object "GDBusConnection") + (c-name "g_dbus_connection_call_with_unix_fd_list_sync") + (return-type "GVariant*") + (parameters + '("const-gchar*" "bus_name") + '("const-gchar*" "object_path") + '("const-gchar*" "interface_name") + '("const-gchar*" "method_name") + '("GVariant*" "parameters") + '("const-GVariantType*" "reply_type") + '("GDBusCallFlags" "flags") + '("gint" "timeout_msec") + '("GUnixFDList*" "fd_list") + '("GUnixFDList**" "out_fd_list") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + (define-method register_object (of-object "GDBusConnection") (c-name "g_dbus_connection_register_object") @@ -3913,447 +3994,6 @@ -;; From gdbus-example-objectmanager-generated.h - -(define-function example_animal_get_type - (c-name "example_animal_get_type") - (return-type "GType") -) - -(define-function example_animal_interface_info - (c-name "example_animal_interface_info") - (return-type "GDBusInterfaceInfo*") -) - -(define-function example_animal_override_properties - (c-name "example_animal_override_properties") - (return-type "guint") - (parameters - '("GObjectClass*" "klass") - '("guint" "property_id_begin") - ) -) - -(define-method complete_poke - (of-object "ExampleAnimal") - (c-name "example_animal_complete_poke") - (return-type "none") - (parameters - '("GDBusMethodInvocation*" "invocation") - ) -) - -(define-method emit_jumped - (of-object "ExampleAnimal") - (c-name "example_animal_emit_jumped") - (return-type "none") - (parameters - '("gdouble" "height") - ) -) - -(define-method call_poke - (of-object "ExampleAnimal") - (c-name "example_animal_call_poke") - (return-type "none") - (parameters - '("gboolean" "make_sad") - '("gboolean" "make_happy") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-method call_poke_finish - (of-object "ExampleAnimal") - (c-name "example_animal_call_poke_finish") - (return-type "gboolean") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-method call_poke_sync - (of-object "ExampleAnimal") - (c-name "example_animal_call_poke_sync") - (return-type "gboolean") - (parameters - '("gboolean" "make_sad") - '("gboolean" "make_happy") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - -(define-method get_mood - (of-object "ExampleAnimal") - (c-name "example_animal_get_mood") - (return-type "const-gchar*") -) - -(define-method set_mood - (of-object "ExampleAnimal") - (c-name "example_animal_set_mood") - (return-type "none") - (parameters - '("const-gchar*" "value") - ) -) - -(define-function example_animal_proxy_get_type - (c-name "example_animal_proxy_get_type") - (return-type "GType") -) - -(define-function example_animal_proxy_new - (c-name "example_animal_proxy_new") - (return-type "none") - (parameters - '("GDBusConnection*" "connection") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-function example_animal_proxy_new_finish - (c-name "example_animal_proxy_new_finish") - (return-type "ExampleAnimal*") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-function example_animal_proxy_new_sync - (c-name "example_animal_proxy_new_sync") - (return-type "ExampleAnimal*") - (parameters - '("GDBusConnection*" "connection") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - -(define-function example_animal_proxy_new_for_bus - (c-name "example_animal_proxy_new_for_bus") - (return-type "none") - (parameters - '("GBusType" "bus_type") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-function example_animal_proxy_new_for_bus_finish - (c-name "example_animal_proxy_new_for_bus_finish") - (return-type "ExampleAnimal*") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-function example_animal_proxy_new_for_bus_sync - (c-name "example_animal_proxy_new_for_bus_sync") - (return-type "ExampleAnimal*") - (parameters - '("GBusType" "bus_type") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - -(define-function example_animal_skeleton_get_type - (c-name "example_animal_skeleton_get_type") - (return-type "GType") -) - -(define-function example_animal_skeleton_new - (c-name "example_animal_skeleton_new") - (is-constructor-of "ExampleAnimalSkeleton") - (return-type "ExampleAnimal*") -) - -(define-function example_cat_get_type - (c-name "example_cat_get_type") - (return-type "GType") -) - -(define-function example_cat_interface_info - (c-name "example_cat_interface_info") - (return-type "GDBusInterfaceInfo*") -) - -(define-function example_cat_proxy_get_type - (c-name "example_cat_proxy_get_type") - (return-type "GType") -) - -(define-function example_cat_proxy_new - (c-name "example_cat_proxy_new") - (return-type "none") - (parameters - '("GDBusConnection*" "connection") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-function example_cat_proxy_new_finish - (c-name "example_cat_proxy_new_finish") - (return-type "ExampleCat*") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-function example_cat_proxy_new_sync - (c-name "example_cat_proxy_new_sync") - (return-type "ExampleCat*") - (parameters - '("GDBusConnection*" "connection") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - -(define-function example_cat_proxy_new_for_bus - (c-name "example_cat_proxy_new_for_bus") - (return-type "none") - (parameters - '("GBusType" "bus_type") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-function example_cat_proxy_new_for_bus_finish - (c-name "example_cat_proxy_new_for_bus_finish") - (return-type "ExampleCat*") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-function example_cat_proxy_new_for_bus_sync - (c-name "example_cat_proxy_new_for_bus_sync") - (return-type "ExampleCat*") - (parameters - '("GBusType" "bus_type") - '("GDBusProxyFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - -(define-function example_cat_skeleton_get_type - (c-name "example_cat_skeleton_get_type") - (return-type "GType") -) - -(define-function example_cat_skeleton_new - (c-name "example_cat_skeleton_new") - (is-constructor-of "ExampleCatSkeleton") - (return-type "ExampleCat*") -) - -(define-function example_object_get_type - (c-name "example_object_get_type") - (return-type "GType") -) - -(define-method get_animal - (of-object "ExampleObject") - (c-name "example_object_get_animal") - (return-type "ExampleAnimal*") -) - -(define-method get_cat - (of-object "ExampleObject") - (c-name "example_object_get_cat") - (return-type "ExampleCat*") -) - -(define-method peek_animal - (of-object "ExampleObject") - (c-name "example_object_peek_animal") - (return-type "ExampleAnimal*") -) - -(define-method peek_cat - (of-object "ExampleObject") - (c-name "example_object_peek_cat") - (return-type "ExampleCat*") -) - -(define-function example_object_proxy_get_type - (c-name "example_object_proxy_get_type") - (return-type "GType") -) - -(define-function example_object_proxy_new - (c-name "example_object_proxy_new") - (is-constructor-of "ExampleObjectProxy") - (return-type "ExampleObjectProxy*") - (parameters - '("GDBusConnection*" "connection") - '("const-gchar*" "object_path") - ) -) - -(define-function example_object_skeleton_get_type - (c-name "example_object_skeleton_get_type") - (return-type "GType") -) - -(define-function example_object_skeleton_new - (c-name "example_object_skeleton_new") - (is-constructor-of "ExampleObjectSkeleton") - (return-type "ExampleObjectSkeleton*") - (parameters - '("const-gchar*" "object_path") - ) -) - -(define-method set_animal - (of-object "ExampleObjectSkeleton") - (c-name "example_object_skeleton_set_animal") - (return-type "none") - (parameters - '("ExampleAnimal*" "interface_") - ) -) - -(define-method set_cat - (of-object "ExampleObjectSkeleton") - (c-name "example_object_skeleton_set_cat") - (return-type "none") - (parameters - '("ExampleCat*" "interface_") - ) -) - -(define-function example_object_manager_client_get_type - (c-name "example_object_manager_client_get_type") - (return-type "GType") -) - -(define-function example_object_manager_client_get_proxy_type - (c-name "example_object_manager_client_get_proxy_type") - (return-type "GType") - (parameters - '("GDBusObjectManagerClient*" "manager") - '("const-gchar*" "object_path") - '("const-gchar*" "interface_name") - '("gpointer" "user_data") - ) -) - -(define-function example_object_manager_client_new - (c-name "example_object_manager_client_new") - (return-type "none") - (parameters - '("GDBusConnection*" "connection") - '("GDBusObjectManagerClientFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-function example_object_manager_client_new_finish - (c-name "example_object_manager_client_new_finish") - (return-type "GDBusObjectManager*") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-function example_object_manager_client_new_sync - (c-name "example_object_manager_client_new_sync") - (return-type "GDBusObjectManager*") - (parameters - '("GDBusConnection*" "connection") - '("GDBusObjectManagerClientFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - -(define-function example_object_manager_client_new_for_bus - (c-name "example_object_manager_client_new_for_bus") - (return-type "none") - (parameters - '("GBusType" "bus_type") - '("GDBusObjectManagerClientFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-function example_object_manager_client_new_for_bus_finish - (c-name "example_object_manager_client_new_for_bus_finish") - (return-type "GDBusObjectManager*") - (parameters - '("GAsyncResult*" "res") - '("GError**" "error") - ) -) - -(define-function example_object_manager_client_new_for_bus_sync - (c-name "example_object_manager_client_new_for_bus_sync") - (return-type "GDBusObjectManager*") - (parameters - '("GBusType" "bus_type") - '("GDBusObjectManagerClientFlags" "flags") - '("const-gchar*" "name") - '("const-gchar*" "object_path") - '("GCancellable*" "cancellable") - '("GError**" "error") - ) -) - - - ;; From gdbusinterface.h (define-function g_dbus_interface_get_type @@ -5141,6 +4781,16 @@ ) ) +(define-method return_value_with_unix_fd_list + (of-object "GDBusMethodInvocation") + (c-name "g_dbus_method_invocation_return_value_with_unix_fd_list") + (return-type "none") + (parameters + '("GVariant*" "parameters") + '("GUnixFDList*" "fd_list") + ) +) + (define-method return_error (of-object "GDBusMethodInvocation") (c-name "g_dbus_method_invocation_return_error") @@ -5889,6 +5539,49 @@ ) ) +(define-method call_with_unix_fd_list + (of-object "GDBusProxy") + (c-name "g_dbus_proxy_call_with_unix_fd_list") + (return-type "none") + (parameters + '("const-gchar*" "method_name") + '("GVariant*" "parameters") + '("GDBusCallFlags" "flags") + '("gint" "timeout_msec") + '("GUnixFDList*" "fd_list") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method call_with_unix_fd_list_finish + (of-object "GDBusProxy") + (c-name "g_dbus_proxy_call_with_unix_fd_list_finish") + (return-type "GVariant*") + (parameters + '("GUnixFDList**" "out_fd_list") + '("GAsyncResult*" "res") + '("GError**" "error") + ) +) + +(define-method call_with_unix_fd_list_sync + (of-object "GDBusProxy") + (c-name "g_dbus_proxy_call_with_unix_fd_list_sync") + (return-type "GVariant*") + (parameters + '("const-gchar*" "method_name") + '("GVariant*" "parameters") + '("GDBusCallFlags" "flags") + '("gint" "timeout_msec") + '("GUnixFDList*" "fd_list") + '("GUnixFDList**" "out_fd_list") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + ;; From gdbusserver.h @@ -6067,6 +5760,15 @@ (return-type "gboolean") ) +(define-method get_show_in + (of-object "GDesktopAppInfo") + (c-name "g_desktop_app_info_get_show_in") + (return-type "gboolean") + (parameters + '("const-gchar*" "desktop_env") + ) +) + (define-function g_desktop_app_info_new (c-name "g_desktop_app_info_new") (is-constructor-of "GDesktopAppInfo") @@ -9412,6 +9114,16 @@ (return-type "GType") ) +(define-function g_tls_password_flags_get_type + (c-name "g_tls_password_flags_get_type") + (return-type "GType") +) + +(define-function g_tls_interaction_result_get_type + (c-name "g_tls_interaction_result_get_type") + (return-type "GType") +) + (define-function g_dbus_interface_skeleton_flags_get_type (c-name "g_dbus_interface_skeleton_flags_get_type") (return-type "GType") @@ -9422,6 +9134,21 @@ (return-type "GType") ) +(define-function g_tls_database_verify_flags_get_type + (c-name "g_tls_database_verify_flags_get_type") + (return-type "GType") +) + +(define-function g_tls_database_lookup_flags_get_type + (c-name "g_tls_database_lookup_flags_get_type") + (return-type "GType") +) + +(define-function g_io_module_scope_flags_get_type + (c-name "g_io_module_scope_flags_get_type") + (return-type "GType") +) + (define-function g_settings_bind_flags_get_type (c-name "g_settings_bind_flags_get_type") (return-type "GType") @@ -9458,11 +9185,31 @@ -;; From gio-marshal.h +;; From giomodule.h +(define-function g_io_module_scope_new + (c-name "g_io_module_scope_new") + (is-constructor-of "GIoModuleScope") + (return-type "GIOModuleScope*") + (parameters + '("GIOModuleScopeFlags" "flags") + ) +) +(define-method free + (of-object "GIOModuleScope") + (c-name "g_io_module_scope_free") + (return-type "none") +) -;; From giomodule.h +(define-method block + (of-object "GIOModuleScope") + (c-name "g_io_module_scope_block") + (return-type "none") + (parameters + '("const-gchar*" "basename") + ) +) (define-function g_io_module_get_type (c-name "g_io_module_get_type") @@ -9494,6 +9241,24 @@ ) ) +(define-function g_io_modules_scan_all_in_directory_with_scope + (c-name "g_io_modules_scan_all_in_directory_with_scope") + (return-type "none") + (parameters + '("const-gchar*" "dirname") + '("GIOModuleScope*" "scope") + ) +) + +(define-function g_io_modules_load_all_in_directory_with_scope + (c-name "g_io_modules_load_all_in_directory_with_scope") + (return-type "GList*") + (parameters + '("const-gchar*" "dirname") + '("GIOModuleScope*" "scope") + ) +) + (define-function g_io_extension_point_register (c-name "g_io_extension_point_register") (return-type "GIOExtensionPoint*") @@ -11692,6 +11457,17 @@ ) ) +(define-method add_entries + (of-object "GSimpleActionGroup") + (c-name "g_simple_action_group_add_entries") + (return-type "none") + (parameters + '("const-GActionEntry*" "entries") + '("gint" "n_entries") + '("gpointer" "user_data") + ) +) + ;; From gsimpleaction.h @@ -11730,6 +11506,15 @@ ) ) +(define-method set_state + (of-object "GSimpleAction") + (c-name "g_simple_action_set_state") + (return-type "none") + (parameters + '("GVariant*" "value") + ) +) + ;; From gsimpleasyncresult.h @@ -13235,20 +13020,6 @@ -;; From gtimezonemonitor.h - -(define-function g_time_zone_monitor_get_type - (c-name "g_time_zone_monitor_get_type") - (return-type "GType") -) - -(define-function g_time_zone_monitor_get - (c-name "g_time_zone_monitor_get") - (return-type "GTimeZoneMonitor*") -) - - - ;; From gtlsbackend.h (define-function g_tls_backend_get_type @@ -13261,6 +13032,12 @@ (return-type "GTlsBackend*") ) +(define-method get_default_database + (of-object "GTlsBackend") + (c-name "g_tls_backend_get_default_database") + (return-type "GTlsDatabase*") +) + (define-method supports_tls (of-object "GTlsBackend") (c-name "g_tls_backend_supports_tls") @@ -13285,6 +13062,12 @@ (return-type "GType") ) +(define-method get_file_database_type + (of-object "GTlsBackend") + (c-name "g_tls_backend_get_file_database_type") + (return-type "GType") +) + ;; From gtlscertificate.h @@ -13443,6 +13226,21 @@ (return-type "gboolean") ) +(define-method set_database + (of-object "GTlsConnection") + (c-name "g_tls_connection_set_database") + (return-type "none") + (parameters + '("GTlsDatabase*" "database") + ) +) + +(define-method get_database + (of-object "GTlsConnection") + (c-name "g_tls_connection_get_database") + (return-type "GTlsDatabase*") +) + (define-method set_certificate (of-object "GTlsConnection") (c-name "g_tls_connection_set_certificate") @@ -13458,6 +13256,21 @@ (return-type "GTlsCertificate*") ) +(define-method set_interaction + (of-object "GTlsConnection") + (c-name "g_tls_connection_set_interaction") + (return-type "none") + (parameters + '("GTlsInteraction*" "interaction") + ) +) + +(define-method get_interaction + (of-object "GTlsConnection") + (c-name "g_tls_connection_get_interaction") + (return-type "GTlsInteraction*") +) + (define-method get_peer_certificate (of-object "GTlsConnection") (c-name "g_tls_connection_get_peer_certificate") @@ -13549,6 +13362,342 @@ +;; From gtlsdatabase.h + +(define-function g_tls_database_get_type + (c-name "g_tls_database_get_type") + (return-type "GType") +) + +(define-method verify_chain + (of-object "GTlsDatabase") + (c-name "g_tls_database_verify_chain") + (return-type "GTlsCertificateFlags") + (parameters + '("GTlsCertificate*" "chain") + '("const-gchar*" "purpose") + '("GSocketConnectable*" "identity") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseVerifyFlags" "flags") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + +(define-method verify_chain_async + (of-object "GTlsDatabase") + (c-name "g_tls_database_verify_chain_async") + (return-type "none") + (parameters + '("GTlsCertificate*" "chain") + '("const-gchar*" "purpose") + '("GSocketConnectable*" "identity") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseVerifyFlags" "flags") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method verify_chain_finish + (of-object "GTlsDatabase") + (c-name "g_tls_database_verify_chain_finish") + (return-type "GTlsCertificateFlags") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + +(define-method create_certificate_handle + (of-object "GTlsDatabase") + (c-name "g_tls_database_create_certificate_handle") + (return-type "gchar*") + (parameters + '("GTlsCertificate*" "certificate") + ) +) + +(define-method lookup_certificate_for_handle + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificate_for_handle") + (return-type "GTlsCertificate*") + (parameters + '("const-gchar*" "handle") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseLookupFlags" "flags") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + +(define-method lookup_certificate_for_handle_async + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificate_for_handle_async") + (return-type "none") + (parameters + '("const-gchar*" "handle") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseLookupFlags" "flags") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method lookup_certificate_for_handle_finish + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificate_for_handle_finish") + (return-type "GTlsCertificate*") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + +(define-method lookup_certificate_issuer + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificate_issuer") + (return-type "GTlsCertificate*") + (parameters + '("GTlsCertificate*" "certificate") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseLookupFlags" "flags") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + +(define-method lookup_certificate_issuer_async + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificate_issuer_async") + (return-type "none") + (parameters + '("GTlsCertificate*" "certificate") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseLookupFlags" "flags") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method lookup_certificate_issuer_finish + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificate_issuer_finish") + (return-type "GTlsCertificate*") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + +(define-method lookup_certificates_issued_by + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificates_issued_by") + (return-type "GList*") + (parameters + '("GByteArray*" "issuer_raw_dn") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseLookupFlags" "flags") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + +(define-method lookup_certificates_issued_by_async + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificates_issued_by_async") + (return-type "none") + (parameters + '("GByteArray*" "issuer_raw_dn") + '("GTlsInteraction*" "interaction") + '("GTlsDatabaseLookupFlags" "flags") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method lookup_certificates_issued_by_finish + (of-object "GTlsDatabase") + (c-name "g_tls_database_lookup_certificates_issued_by_finish") + (return-type "GList*") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + + + +;; From gtlsfiledatabase.h + +(define-function g_tls_file_database_get_type + (c-name "g_tls_file_database_get_type") + (return-type "GType") +) + +(define-function g_tls_file_database_new + (c-name "g_tls_file_database_new") + (is-constructor-of "GTlsFileDatabase") + (return-type "GTlsDatabase*") + (parameters + '("const-gchar*" "anchors") + '("GError**" "error") + ) +) + + + +;; From gtlsinteraction.h + +(define-function g_tls_interaction_get_type + (c-name "g_tls_interaction_get_type") + (return-type "GType") +) + +(define-method invoke_ask_password + (of-object "GTlsInteraction") + (c-name "g_tls_interaction_invoke_ask_password") + (return-type "GTlsInteractionResult") + (parameters + '("GTlsPassword*" "password") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + +(define-method ask_password + (of-object "GTlsInteraction") + (c-name "g_tls_interaction_ask_password") + (return-type "GTlsInteractionResult") + (parameters + '("GTlsPassword*" "password") + '("GCancellable*" "cancellable") + '("GError**" "error") + ) +) + +(define-method ask_password_async + (of-object "GTlsInteraction") + (c-name "g_tls_interaction_ask_password_async") + (return-type "none") + (parameters + '("GTlsPassword*" "password") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method ask_password_finish + (of-object "GTlsInteraction") + (c-name "g_tls_interaction_ask_password_finish") + (return-type "GTlsInteractionResult") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + + + +;; From gtlspassword.h + +(define-function g_tls_password_get_type + (c-name "g_tls_password_get_type") + (return-type "GType") +) + +(define-function g_tls_password_new + (c-name "g_tls_password_new") + (is-constructor-of "GTlsPassword") + (return-type "GTlsPassword*") + (parameters + '("GTlsPasswordFlags" "flags") + '("const-gchar*" "description") + ) +) + +(define-method get_value + (of-object "GTlsPassword") + (c-name "g_tls_password_get_value") + (return-type "const-guchar*") + (parameters + '("gsize*" "length") + ) +) + +(define-method set_value + (of-object "GTlsPassword") + (c-name "g_tls_password_set_value") + (return-type "none") + (parameters + '("const-guchar*" "value") + '("gssize" "length") + ) +) + +(define-method set_value_full + (of-object "GTlsPassword") + (c-name "g_tls_password_set_value_full") + (return-type "none") + (parameters + '("guchar*" "value") + '("gssize" "length") + '("GDestroyNotify" "destroy") + ) +) + +(define-method get_flags + (of-object "GTlsPassword") + (c-name "g_tls_password_get_flags") + (return-type "GTlsPasswordFlags") +) + +(define-method set_flags + (of-object "GTlsPassword") + (c-name "g_tls_password_set_flags") + (return-type "none") + (parameters + '("GTlsPasswordFlags" "flags") + ) +) + +(define-method get_description + (of-object "GTlsPassword") + (c-name "g_tls_password_get_description") + (return-type "const-gchar*") +) + +(define-method set_description + (of-object "GTlsPassword") + (c-name "g_tls_password_set_description") + (return-type "none") + (parameters + '("const-gchar*" "description") + ) +) + +(define-method get_warning + (of-object "GTlsPassword") + (c-name "g_tls_password_get_warning") + (return-type "const-gchar*") +) + +(define-method set_warning + (of-object "GTlsPassword") + (c-name "g_tls_password_set_warning") + (return-type "none") + (parameters + '("const-gchar*" "warning") + ) +) + + + ;; From gtlsserverconnection.h (define-function g_tls_server_connection_get_type diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs index 97ceb95b..2f3c2f04 100644 --- a/gio/src/gio_signals.defs +++ b/gio/src/gio_signals.defs @@ -1,5 +1,52 @@ ;; From GAsyncResult +;; From GAction + +(define-property enabled + (of-object "GAction") + (prop-type "GParamBoolean") + (docs "If the action can be activated") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property name + (of-object "GAction") + (prop-type "GParamString") + (docs "The name used to invoke the action") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property parameter-type + (of-object "GAction") + (prop-type "GParamBoxed") + (docs "The type of GVariant passed to activate()") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property state + (of-object "GAction") + (prop-type "GParamVariant") + (docs "The state the action is in") + (readable #t) + (writable #f) + (construct-only #f) +) + +(define-property state-type + (of-object "GAction") + (prop-type "GParamBoxed") + (docs "The type of the state kept by the action") + (readable #t) + (writable #f) + (construct-only #f) +) + ;; From GActionGroup (define-signal action-added @@ -800,14 +847,6 @@ (construct-only #t) ) -;; From GTimeZoneMonitor - -(define-signal changed - (of-object "GTimeZoneMonitor") - (return-type "void") - (when "first") -) - ;; From GVolume (define-signal changed diff --git a/glib/src/variant.hg b/glib/src/variant.hg index 89fcba0b..cfd187d6 100644 --- a/glib/src/variant.hg +++ b/glib/src/variant.hg @@ -302,6 +302,8 @@ public: void get_child(VariantBase& child, gsize index = 0) const; _IGNORE(g_variant_get_child, g_variant_get_child_value) +#m4 _CONVERSION(`GVariant*',`VariantBase',`Glib::wrap($3, true)') + _WRAP_METHOD(VariantBase get_child(gsize index = 0), g_variant_get_child_value) /* TODO?: diff --git a/tools/extra_defs_gen/generate_defs_gio.cc b/tools/extra_defs_gen/generate_defs_gio.cc index cdd87349..bbcfd00f 100644 --- a/tools/extra_defs_gen/generate_defs_gio.cc +++ b/tools/extra_defs_gen/generate_defs_gio.cc @@ -38,6 +38,7 @@ int main(int, char**) g_type_init (); std::cout << get_defs(G_TYPE_ASYNC_RESULT) + << get_defs(G_TYPE_ACTION) << get_defs(G_TYPE_ACTION_GROUP) << get_defs(G_TYPE_APPLICATION) << get_defs(G_TYPE_CANCELLABLE) diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index cc1e59f7..ea8e3b4d 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -135,7 +135,6 @@ _CONVERSION(`GFileOutputStream*',`Glib::RefPtr<FileOutputStream>',`Glib::wrap($3 _CONVERSION(`GFileIOStream*',`Glib::RefPtr<FileIOStream>',`Glib::wrap($3)') - # Icon _CONVERSION(`GIcon*',`Glib::RefPtr<Icon>',`Glib::wrap($3)') _CONVERSION(`const Glib::RefPtr<Icon>&',`GIcon*',__CONVERT_CONST_REFPTR_TO_P) @@ -188,12 +187,6 @@ _CONVERSION(`const Glib::StringArrayHandle&',`const gchar*-const*',`($3).data()' _CONVERSION(`const Glib::RefPtr<SettingsBackend>&',`GSettingsBackend*',__CONVERT_REFPTR_TO_P) -#_CONVERSION(`GVariant*',`Glib::VariantBase',`Glib::wrap($3, true)') -_CONVERSION(`GVariant*',`VariantBase',`Glib::wrap($3, true)') -_CONVERSION(`GVariant*',`Glib::VariantContainerBase',`Glib::VariantContainerBase($3, false)') -_CONVERSION(`const Glib::VariantBase&',`GVariant*',`const_cast<GVariant*>(($3).gobj())') -_CONVERSION(`const Glib::VariantContainerBase&',`GVariant*',`const_cast<GVariant*>(($3).gobj())') - #Socket _CONVERSION(`const Glib::RefPtr<Socket>&',`GSocket*',__CONVERT_CONST_REFPTR_TO_P) _CONVERSION(`GSocket*',`Glib::RefPtr<Socket>',`Glib::wrap($3)') @@ -221,6 +214,15 @@ _CONVERSION(`GTimeZoneMonitor*',`Glib::RefPtr<TimeZoneMonitor>',`Glib::wrap($3)' _CONVERSION(`GUnixFDList*',`Glib::RefPtr<UnixFDList>',`Glib::wrap($3)') _CONVERSION(`const Glib::RefPtr<UnixFDList>&',`GUnixFDList*',`Glib::unwrap($3)') +#Variant +_CONVERSION(`GVariant*',`Glib::VariantBase',`Glib::wrap($3, false)') +_CONVERSION(`GVariant*',`Glib::VariantContainerBase',`Glib::VariantContainerBase($3, false)') +_CONVERSION(`const Glib::VariantBase&',`GVariant*',`const_cast<GVariant*>(($3).gobj())') +_CONVERSION(`const Glib::VariantContainerBase&',`GVariant*',`const_cast<GVariant*>(($3).gobj())') + +#VariantType +_CONVERSION(`const GVariantType*',`Glib::VariantType',`Glib::wrap(const_cast<GVariantType*>($3), true)') + #Volume _CONVERSION(`GVolume*',`Glib::RefPtr<Volume>',`Glib::wrap($3)') |