[glibmm] Fix the build with the latest glib API.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Fix the build with the latest glib API.
- Date: Tue, 19 Oct 2010 08:45:18 +0000 (UTC)
commit 1e5a0e79972dbd92da1c8197ee96ea204022ac22
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Oct 19 10:45:04 2010 +0200
Fix the build with the latest glib API.
* gio/src/gio_enums.defs: Regenerated with enums.pl.
* gio/src/gio_methods.defs: Regenerated with h2defs.py.
* gio/src/gio_signals.defs: Regenerated with extra_defs.
* gio/src/application.[hg|ccg]: Adapt to the changed API in glibmm,
though several functions, properties and signals are not yet wrapped.
* gio/src/dbusserver.hg: new_connection signal: Now returns a bool.
* tools/m4/convert_gio.m4: Mention the new enum.
ChangeLog | 12 +
gio/src/application.ccg | 29 -
gio/src/application.hg | 41 +-
gio/src/dbusserver.hg | 2 +-
gio/src/gio_enums.defs | 27 +-
gio/src/gio_methods.defs | 1547 ++++++++--------------------------------------
gio/src/gio_signals.defs | 87 ++--
tools/m4/convert_gio.m4 | 1 +
8 files changed, 375 insertions(+), 1371 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 831a726..7ff17ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-19 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with the latest glib API.
+
+ * gio/src/gio_enums.defs: Regenerated with enums.pl.
+ * gio/src/gio_methods.defs: Regenerated with h2defs.py.
+ * gio/src/gio_signals.defs: Regenerated with extra_defs.
+ * gio/src/application.[hg|ccg]: Adapt to the changed API in glibmm,
+ though several functions, properties and signals are not yet wrapped.
+ * gio/src/dbusserver.hg: new_connection signal: Now returns a bool.
+ * tools/m4/convert_gio.m4: Mention the new enum.
+
2010-10-18 José Alburquerque <jaalburqu svn gnome org>
glibmm: ustring: Restore last block removed by #ifdef removal script.
diff --git a/gio/src/application.ccg b/gio/src/application.ccg
index 365f8d3..64497f3 100644
--- a/gio/src/application.ccg
+++ b/gio/src/application.ccg
@@ -23,34 +23,5 @@
namespace Gio
{
-Glib::RefPtr<Application> Application::create(const Glib::ustring& appid)
-{
- return Glib::wrap(g_application_new(appid.c_str(), 0, 0));
-}
-
-
-Glib::RefPtr<Application> Application::create_try(const Glib::ustring& appid)
-{
- GError* gerror = 0;
- Glib::RefPtr<Application> retvalue = Glib::wrap(g_application_try_new(appid.c_str(), 0, 0, &(gerror)));
-
- if(gerror)
- ::Glib::Error::throw_exception(gerror);
-
- return retvalue;
-}
-
-
-Glib::RefPtr<Application> Application::create_unregistered_try(const Glib::ustring& appid)
-{
- GError* gerror = 0;
- Glib::RefPtr<Application> retvalue = Glib::wrap(g_application_unregistered_try_new(appid.c_str(), 0, 0, &(gerror)));
-
- if(gerror)
- ::Glib::Error::throw_exception(gerror);
-
- return retvalue;
-}
-
} // namespace Gio
diff --git a/gio/src/application.hg b/gio/src/application.hg
index d08a00b..87c5295 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -17,6 +17,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <giomm/cancellable.h>
#include <glibmm/object.h>
#include <glibmm/variant.h>
@@ -26,6 +27,8 @@ _PINCLUDE(glibmm/private/object_p.h)
namespace Gio
{
+_WRAP_ENUM(ApplicationFlags, GApplicationFlags, NO_GTYPE)
+
/** TODO
*
* @newin{2,26}
@@ -40,53 +43,45 @@ protected:
public:
//_WRAP_CREATE()
- _WRAP_METHOD(static Glib::RefPtr<Application> create(const Glib::ustring& appid, int argc, char** argv), g_application_new)
-
- //TODO: Documentation
- static Glib::RefPtr<Application> create(const Glib::ustring& appid);
+ _WRAP_METHOD(static Glib::RefPtr<Application> create(const Glib::ustring& appid, ApplicationFlags flags = APPLICATION_FLAGS_NONE), g_application_new)
- _WRAP_METHOD(static Glib::RefPtr<Application> create_try(const Glib::ustring& appid, int argc, char** argv), g_application_try_new, errthrow)
-
- //TODO: Documentation
- static Glib::RefPtr<Application> create_try(const Glib::ustring& appid);
+ _WRAP_METHOD(static Glib::RefPtr<Application> create_try(const Glib::ustring& appid, ApplicationFlags flags = APPLICATION_FLAGS_NONE), g_application_try_new, errthrow)
- _WRAP_METHOD(static Glib::RefPtr<Application> create_unregistered_try(const Glib::ustring& appid, int argc, char** argv), g_application_unregistered_try_new, errthrow)
-
- //TODO: Documentation
- static Glib::RefPtr<Application> create_unregistered_try(const Glib::ustring& appid);
+ _WRAP_METHOD(static Glib::RefPtr<Application> create_unregistered_try(const Glib::ustring& appid, ApplicationFlags flags = APPLICATION_FLAGS_NONE), g_application_unregistered_try_new, errthrow)
+ //TODO: Add a version with no cancellable.
//Renamed from register() because that is a C++ keyword.
- _WRAP_METHOD(bool register_application(), g_application_register)
+ _WRAP_METHOD(bool register_application(const Glib::RefPtr<Gio::Cancellable>& cancellable), g_application_register, errthrow)
_WRAP_METHOD(static Glib::RefPtr<Application> get_instance(), g_application_get_instance, refreturn)
_WRAP_METHOD(Glib::ustring get_id() const, g_application_get_id)
_WRAP_METHOD(void add_action(const Glib::ustring& name, const Glib::ustring& description), g_application_add_action)
_WRAP_METHOD(void remove_action(const Glib::ustring& name), g_application_remove_action)
-
+
#m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
_WRAP_METHOD(Glib::StringArrayHandle list_actions() const, g_application_list_actions)
-
+
_WRAP_METHOD(void set_action_enabled(const Glib::ustring& name, bool enabled = true), g_application_set_action_enabled)
_WRAP_METHOD(bool get_action_enabled(const Glib::ustring& name) const, g_application_get_action_enabled)
_WRAP_METHOD(Glib::ustring get_action_description(const Glib::ustring& name), g_application_get_action_description)
_WRAP_METHOD(void invoke_action(const Glib::ustring& name, const Glib::VariantBase& platform_data), g_application_invoke_action)
- _WRAP_METHOD(void run(), g_application_run)
+ _WRAP_METHOD(void run(int argc, char** argv), g_application_run)
+ //TODO: g_application_run_with_arguments)
_WRAP_METHOD(bool quit_with_data(const Glib::VariantBase& platform_data), g_application_quit_with_data)
_WRAP_METHOD(bool is_remote() const, g_application_is_remote)
-#m4 _CONVERSION(`const gchar*', `const Glib::ustring&', `Glib::ustring($3)')
-#m4 _CONVERSION(`GVariant*', `const Glib::VariantBase&', `Glib::wrap($3, true)')
- _WRAP_SIGNAL(void action_with_data(const Glib::ustring& name, const Glib::VariantBase& platform_data), "action-with-data")
+//#m4 _CONVERSION(`const gchar*', `const Glib::ustring&', `Glib::ustring($3)')
+//#m4 _CONVERSION(`GVariant*', `const Glib::VariantBase&', `Glib::wrap($3, true)')
- _WRAP_SIGNAL(void prepare_activation(const Glib::VariantBase& arguments, const Glib::VariantBase& platform_data), "prepare-activation")
-
- _WRAP_SIGNAL(bool quit_with_data(const Glib::VariantBase& platform_data), "quit-with-data")
+ _WRAP_SIGNAL(void startup(), "startup")
+ _WRAP_SIGNAL(void activate(), "activate")
+ //TODO: _WRAP_SIGNAL(void open(GFile** files, int n_files, const Glib::ustring& hint), "open")
+ //TODO: Wrap ApplicationCommandLine: _WRAP_SIGNAL(void command_line(const Glib::RefPtr<ApplicationCommandLine>& command_line), "command-line")
};
} // namespace Gio
-
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index 57161e7..d27eef1 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -71,7 +71,7 @@ public:
_WRAP_PROPERTY("guid", Glib::ustring)
#m4 _CONVERSION(`GDBusConnection*', `const Glib::RefPtr<DBusConnection>&', `Glib::wrap($3, true)')
- _WRAP_SIGNAL(void new_connection(const Glib::RefPtr<DBusConnection>& connection), "new-connection", no_default_handler)
+ _WRAP_SIGNAL(bool new_connection(const Glib::RefPtr<DBusConnection>& connection), "new-connection", no_default_handler)
};
} // namespace Gio
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index 3cc5966..34e0a72 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -442,7 +442,7 @@
'("busy" "G_IO_ERROR_BUSY" "26")
'("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
'("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
- '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
+ '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
'("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
'("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
'("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
@@ -1091,11 +1091,34 @@
(in-module "G")
(c-name "GDBusMessageByteOrder")
(values
- '("big-endian" "G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN" "'B'")
+ '("big-endian" "G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN" "0")
'("little-endian" "G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN" "'l'")
)
)
+;; Original typedef:
+;; typedef enum
+;; {
+;; G_APPLICATION_FLAGS_NONE,
+;; G_APPLICATION_IS_SERVICE = (1 << 0),
+;; G_APPLICATION_IS_LAUNCHER = (1 << 1),
+;;
+;; G_APPLICATION_HANDLES_OPEN = (1 << 2),
+;; G_APPLICATION_HANDLES_COMMAND_LINE = (1 << 3)
+;; } GApplicationFlags;
+
+(define-flags-extended ApplicationFlags
+ (in-module "G")
+ (c-name "GApplicationFlags")
+ (values
+ '("flags-none" "G_APPLICATION_FLAGS_NONE" "0x0")
+ '("is-service" "G_APPLICATION_IS_SERVICE" "(1 << 0)")
+ '("is-launcher" "G_APPLICATION_IS_LAUNCHER" "(1 << 1)")
+ '("handles-open" "G_APPLICATION_HANDLES_OPEN" "(1 << 2)")
+ '("handles-command-line" "G_APPLICATION_HANDLES_COMMAND_LINE" "(1 << 3)")
+ )
+)
+
;; From gsettings.h
;; Original typedef:
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 0993eb7..695fb30 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -20,6 +20,13 @@
(gtype-id "G_TYPE_APPLICATION")
)
+(define-object CommandLine
+ (in-module "GApplication")
+ (parent "GObject")
+ (c-name "GApplicationCommandLine")
+ (gtype-id "G_TYPE_APPLICATION_COMMAND_LINE")
+)
+
(define-object Initable
(in-module "GAsync")
(c-name "GAsyncInitable")
@@ -45,41 +52,6 @@
(gtype-id "G_TYPE_CONVERTER")
)
-(define-object Auth
- (in-module "GDBus")
- (parent "GObject")
- (c-name "GDBusAuth")
- (gtype-id "G_TYPE_D_BUS_AUTH")
-)
-
-(define-object AuthMechanism
- (in-module "GDBus")
- (parent "GObject")
- (c-name "GDBusAuthMechanism")
- (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM")
-)
-
-(define-object AuthMechanismAnon
- (in-module "GDBus")
- (parent "GDBusAuthMechanism")
- (c-name "GDBusAuthMechanismAnon")
- (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_ANON")
-)
-
-(define-object AuthMechanismExternal
- (in-module "GDBus")
- (parent "GDBusAuthMechanism")
- (c-name "GDBusAuthMechanismExternal")
- (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_EXTERNAL")
-)
-
-(define-object AuthMechanismSha1
- (in-module "GDBus")
- (parent "GDBusAuthMechanism")
- (c-name "GDBusAuthMechanismSha1")
- (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_SHA1")
-)
-
(define-object Proxy
(in-module "GDBus")
(parent "GObject")
@@ -87,12 +59,6 @@
(gtype-id "G_TYPE_D_BUS_PROXY")
)
-(define-object AppInfoLookup
- (in-module "GDesktop")
- (c-name "GDesktopAppInfoLookup")
- (gtype-id "G_TYPE_DESKTOP_APP_INFO_LOOKUP")
-)
-
(define-object e
(in-module "GDriv")
(c-name "GDrive")
@@ -105,12 +71,6 @@
(gtype-id "G_TYPE_FILE")
)
-(define-object DescriptorBased
- (in-module "GFile")
- (c-name "GFileDescriptorBased")
- (gtype-id "G_TYPE_FILE_DESCRIPTOR_BASED")
-)
-
(define-object Enumerator
(in-module "GFile")
(parent "GObject")
@@ -206,34 +166,6 @@
(gtype-id "G_TYPE_LOADABLE_ICON")
)
-(define-object DirectoryMonitor
- (in-module "GLocal")
- (parent "GFileMonitor")
- (c-name "GLocalDirectoryMonitor")
- (gtype-id "G_TYPE_LOCAL_DIRECTORY_MONITOR")
-)
-
-(define-object FileIOStream
- (in-module "GLocal")
- (parent "GFileIOStream")
- (c-name "GLocalFileIOStream")
- (gtype-id "G_TYPE_LOCAL_FILE_IO_STREAM")
-)
-
-(define-object FileInputStream
- (in-module "GLocal")
- (parent "GFileInputStream")
- (c-name "GLocalFileInputStream")
- (gtype-id "G_TYPE_LOCAL_FILE_INPUT_STREAM")
-)
-
-(define-object FileMonitor
- (in-module "GLocal")
- (parent "GFileMonitor")
- (c-name "GLocalFileMonitor")
- (gtype-id "G_TYPE_LOCAL_FILE_MONITOR")
-)
-
(define-object InputStream
(in-module "GMemory")
(parent "GInputStream")
@@ -317,13 +249,6 @@
(gtype-id "G_TYPE_FILE_OUTPUT_STREAM")
)
-(define-object FileOutputStream
- (in-module "GLocal")
- (parent "GFileOutputStream")
- (c-name "GLocalFileOutputStream")
- (gtype-id "G_TYPE_LOCAL_FILE_OUTPUT_STREAM")
-)
-
(define-object n
(in-module "GPermissio")
(parent "GObject")
@@ -358,20 +283,6 @@
(gtype-id "G_TYPE_SETTINGS_BACKEND")
)
-(define-object SettingsBackend
- (in-module "GDelayed")
- (parent "GSettingsBackend")
- (c-name "GDelayedSettingsBackend")
- (gtype-id "G_TYPE_DELAYED_SETTINGS_BACKEND")
-)
-
-(define-object Schema
- (in-module "GSettings")
- (parent "GObject")
- (c-name "GSettingsSchema")
- (gtype-id "G_TYPE_SETTINGS_SCHEMA")
-)
-
(define-object Action
(in-module "GSimple")
(parent "GObject")
@@ -455,13 +366,6 @@
(gtype-id "G_TYPE_SOCKET_CONTROL_MESSAGE")
)
-(define-object InputStream
- (in-module "GSocket")
- (parent "GInputStream")
- (c-name "GSocketInputStream")
- (gtype-id "G_TYPE_SOCKET_INPUT_STREAM")
-)
-
(define-object Listener
(in-module "GSocket")
(parent "GObject")
@@ -469,13 +373,6 @@
(gtype-id "G_TYPE_SOCKET_LISTENER")
)
-(define-object OutputStream
- (in-module "GSocket")
- (parent "GOutputStream")
- (c-name "GSocketOutputStream")
- (gtype-id "G_TYPE_SOCKET_OUTPUT_STREAM")
-)
-
(define-object Service
(in-module "GSocket")
(parent "GSocketListener")
@@ -483,13 +380,6 @@
(gtype-id "G_TYPE_SOCKET_SERVICE")
)
-(define-object 4aProxy
- (in-module "GSocks")
- (parent "GObject")
- (c-name "GSocks4aProxy")
- (gtype-id "G_TYPE_SOCKS4A_PROXY")
-)
-
(define-object Connection
(in-module "GTcp")
(parent "GSocketConnection")
@@ -497,13 +387,6 @@
(gtype-id "G_TYPE_TCP_CONNECTION")
)
-(define-object Connection
- (in-module "GProxy")
- (parent "GTcpConnection")
- (c-name "GProxyConnection")
- (gtype-id "G_TYPE_PROXY_CONNECTION")
-)
-
(define-object SocketService
(in-module "GThreaded")
(parent "GSocketService")
@@ -511,55 +394,6 @@
(gtype-id "G_TYPE_THREADED_SOCKET_SERVICE")
)
-(define-object Connection
- (in-module "GUnix")
- (parent "GSocketConnection")
- (c-name "GUnixConnection")
- (gtype-id "G_TYPE_UNIX_CONNECTION")
-)
-
-(define-object CredentialsMessage
- (in-module "GUnix")
- (parent "GSocketControlMessage")
- (c-name "GUnixCredentialsMessage")
- (gtype-id "G_TYPE_UNIX_CREDENTIALS_MESSAGE")
-)
-
-(define-object FDList
- (in-module "GUnix")
- (parent "GObject")
- (c-name "GUnixFDList")
- (gtype-id "G_TYPE_UNIX_FD_LIST")
-)
-
-(define-object FDMessage
- (in-module "GUnix")
- (parent "GSocketControlMessage")
- (c-name "GUnixFDMessage")
- (gtype-id "G_TYPE_UNIX_FD_MESSAGE")
-)
-
-(define-object InputStream
- (in-module "GUnix")
- (parent "GInputStream")
- (c-name "GUnixInputStream")
- (gtype-id "G_TYPE_UNIX_INPUT_STREAM")
-)
-
-(define-object OutputStream
- (in-module "GUnix")
- (parent "GOutputStream")
- (c-name "GUnixOutputStream")
- (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM")
-)
-
-(define-object SocketAddress
- (in-module "GUnix")
- (parent "GSocketAddress")
- (c-name "GUnixSocketAddress")
- (gtype-id "G_TYPE_UNIX_SOCKET_ADDRESS")
-)
-
(define-object s
(in-module "GVf")
(parent "GObject")
@@ -587,35 +421,8 @@
(gtype-id "G_TYPE_NATIVE_VOLUME_MONITOR")
)
-(define-object 32InputStream
- (in-module "GWin")
- (parent "GInputStream")
- (c-name "GWin32InputStream")
- (gtype-id "G_TYPE_WIN32_INPUT_STREAM")
-)
-
-(define-object 32OutputStream
- (in-module "GWin")
- (parent "GOutputStream")
- (c-name "GWin32OutputStream")
- (gtype-id "G_TYPE_WIN32_OUTPUT_STREAM")
-)
-
;; Enumerations and flags ...
-(define-enum AuthMechanismState
- (in-module "GDBus")
- (c-name "GDBusAuthMechanismState")
- (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_STATE")
- (values
- '("invalid" "G_DBUS_AUTH_MECHANISM_STATE_INVALID")
- '("waiting-for-data" "G_DBUS_AUTH_MECHANISM_STATE_WAITING_FOR_DATA")
- '("have-data-to-send" "G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND")
- '("rejected" "G_DBUS_AUTH_MECHANISM_STATE_REJECTED")
- '("accepted" "G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED")
- )
-)
-
(define-flags InfoCreateFlags
(in-module "GApp")
(c-name "GAppInfoCreateFlags")
@@ -719,8 +526,8 @@
(c-name "GFileQueryInfoFlags")
(gtype-id "G_TYPE_FILE_QUERY_INFO_FLAGS")
(values
- '("ne" "G_FILE_QUERY_INFO_NONE")
- '("follow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS")
+ '("none" "G_FILE_QUERY_INFO_NONE")
+ '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS")
)
)
@@ -740,7 +547,7 @@
(c-name "GMountMountFlags")
(gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
(values
- '("e" "G_MOUNT_MOUNT_NONE")
+ '("none" "G_MOUNT_MOUNT_NONE")
)
)
@@ -759,7 +566,7 @@
(c-name "GDriveStartFlags")
(gtype-id "G_TYPE_DRIVE_START_FLAGS")
(values
- '("e" "G_DRIVE_START_NONE")
+ '("none" "G_DRIVE_START_NONE")
)
)
@@ -970,10 +777,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")
)
)
@@ -1161,8 +968,8 @@
(c-name "GDBusCallFlags")
(gtype-id "G_TYPE_D_BUS_CALL_FLAGS")
(values
- '("ne" "G_DBUS_CALL_FLAGS_NONE")
- '("-auto-start" "G_DBUS_CALL_FLAGS_NO_AUTO_START")
+ '("none" "G_DBUS_CALL_FLAGS_NONE")
+ '("no-auto-start" "G_DBUS_CALL_FLAGS_NO_AUTO_START")
)
)
@@ -1184,9 +991,9 @@
(c-name "GDBusMessageFlags")
(gtype-id "G_TYPE_D_BUS_MESSAGE_FLAGS")
(values
- '("ne" "G_DBUS_MESSAGE_FLAGS_NONE")
- '("-reply-expected" "G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED")
- '("-auto-start" "G_DBUS_MESSAGE_FLAGS_NO_AUTO_START")
+ '("none" "G_DBUS_MESSAGE_FLAGS_NONE")
+ '("no-reply-expected" "G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED")
+ '("no-auto-start" "G_DBUS_MESSAGE_FLAGS_NO_AUTO_START")
)
)
@@ -1245,7 +1052,7 @@
(c-name "GDBusSignalFlags")
(gtype-id "G_TYPE_D_BUS_SIGNAL_FLAGS")
(values
- '("e" "G_DBUS_SIGNAL_FLAGS_NONE")
+ '("none" "G_DBUS_SIGNAL_FLAGS_NONE")
)
)
@@ -1280,6 +1087,19 @@
)
)
+(define-flags Flags
+ (in-module "GApplication")
+ (c-name "GApplicationFlags")
+ (gtype-id "G_TYPE_APPLICATION_FLAGS")
+ (values
+ '("flags-none" "G_APPLICATION_FLAGS_NONE")
+ '("is-service" "G_APPLICATION_IS_SERVICE")
+ '("is-launcher" "G_APPLICATION_IS_LAUNCHER")
+ '("handles-open" "G_APPLICATION_HANDLES_OPEN")
+ '("handles-command-line" "G_APPLICATION_HANDLES_COMMAND_LINE")
+ )
+)
+
(define-flags BindFlags
(in-module "GSettings")
(c-name "GSettingsBindFlags")
@@ -1317,54 +1137,54 @@
(return-type "gchar**")
)
-(define-method get_parameter_type
+(define-method get_action_parameter_type
(of-object "GActionGroup")
- (c-name "g_action_group_get_parameter_type")
+ (c-name "g_action_group_get_action_parameter_type")
(return-type "const-GVariantType*")
(parameters
'("const-gchar*" "action_name")
)
)
-(define-method get_state_type
+(define-method get_action_state_type
(of-object "GActionGroup")
- (c-name "g_action_group_get_state_type")
+ (c-name "g_action_group_get_action_state_type")
(return-type "const-GVariantType*")
(parameters
'("const-gchar*" "action_name")
)
)
-(define-method get_state_hint
+(define-method get_action_state_hint
(of-object "GActionGroup")
- (c-name "g_action_group_get_state_hint")
+ (c-name "g_action_group_get_action_state_hint")
(return-type "GVariant*")
(parameters
'("const-gchar*" "action_name")
)
)
-(define-method get_enabled
+(define-method get_action_enabled
(of-object "GActionGroup")
- (c-name "g_action_group_get_enabled")
+ (c-name "g_action_group_get_action_enabled")
(return-type "gboolean")
(parameters
'("const-gchar*" "action_name")
)
)
-(define-method get_state
+(define-method get_action_state
(of-object "GActionGroup")
- (c-name "g_action_group_get_state")
+ (c-name "g_action_group_get_action_state")
(return-type "GVariant*")
(parameters
'("const-gchar*" "action_name")
)
)
-(define-method set_state
+(define-method change_action_state
(of-object "GActionGroup")
- (c-name "g_action_group_set_state")
+ (c-name "g_action_group_change_action_state")
(return-type "none")
(parameters
'("const-gchar*" "action_name")
@@ -1372,9 +1192,9 @@
)
)
-(define-method activate
+(define-method activate_action
(of-object "GActionGroup")
- (c-name "g_action_group_activate")
+ (c-name "g_action_group_activate_action")
(return-type "none")
(parameters
'("const-gchar*" "action_name")
@@ -1748,152 +1568,249 @@
-;; From gapplication.h
+;; From gapplicationcommandline.h
-(define-function g_application_get_type
- (c-name "g_application_get_type")
+(define-function g_application_command_line_get_type
+ (c-name "g_application_command_line_get_type")
(return-type "GType")
)
-(define-function g_application_new
- (c-name "g_application_new")
- (is-constructor-of "GApplication")
- (return-type "GApplication*")
+(define-method get_argc_argv
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_argc_argv")
+ (return-type "none")
(parameters
- '("const-gchar*" "appid")
- '("int" "argc")
- '("char**" "argv")
+ '("int*" "argc")
+ '("char***" "argv")
)
)
-(define-function g_application_try_new
- (c-name "g_application_try_new")
- (is-constructor-of "GApplicationTry")
- (return-type "GApplication*")
+(define-method get_arguments
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_arguments")
+ (return-type "GVariant*")
+)
+
+(define-method get_cwd
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_cwd")
+ (return-type "const-gchar*")
+)
+
+(define-method get_cwd_variant
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_cwd_variant")
+ (return-type "GVariant*")
+)
+
+(define-method get_is_remote
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_is_remote")
+ (return-type "gboolean")
+)
+
+(define-method output
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_output")
+ (return-type "none")
(parameters
- '("const-gchar*" "appid")
- '("int" "argc")
- '("char**" "argv")
- '("GError**" "error")
+ '("gint" "fd")
+ '("gconstpointer" "buffer")
+ '("gssize" "length")
)
)
-(define-function g_application_unregistered_try_new
- (c-name "g_application_unregistered_try_new")
- (is-constructor-of "GApplicationUnregisteredTry")
- (return-type "GApplication*")
+(define-method print
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_print")
+ (return-type "none")
(parameters
- '("const-gchar*" "appid")
- '("int" "argc")
- '("char**" "argv")
- '("GError**" "error")
+ '("const-gchar*" "format")
)
+ (varargs #t)
)
-(define-method register
- (of-object "GApplication")
- (c-name "g_application_register")
+(define-method printerr
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_printerr")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "format")
+ )
+ (varargs #t)
+)
+
+(define-method get_exit_status
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_exit_status")
+ (return-type "int")
+)
+
+(define-method set_exit_status
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_set_exit_status")
+ (return-type "none")
+ (parameters
+ '("int" "exit_status")
+ )
+)
+
+(define-method get_platform_data
+ (of-object "GApplicationCommandLine")
+ (c-name "g_application_command_line_get_platform_data")
+ (return-type "GVariant*")
+)
+
+
+
+;; From gapplication.h
+
+(define-function g_application_get_type
+ (c-name "g_application_get_type")
+ (return-type "GType")
+)
+
+(define-function g_application_id_is_valid
+ (c-name "g_application_id_is_valid")
(return-type "gboolean")
+ (parameters
+ '("const-gchar*" "application_id")
+ )
)
-(define-function g_application_get_instance
- (c-name "g_application_get_instance")
+(define-function g_application_new
+ (c-name "g_application_new")
+ (is-constructor-of "GApplication")
(return-type "GApplication*")
+ (parameters
+ '("const-gchar*" "application_id")
+ '("GApplicationFlags" "flags")
+ )
)
-(define-method get_id
+(define-method get_application_id
(of-object "GApplication")
- (c-name "g_application_get_id")
+ (c-name "g_application_get_application_id")
(return-type "const-gchar*")
)
-(define-method add_action
+(define-method set_application_id
(of-object "GApplication")
- (c-name "g_application_add_action")
+ (c-name "g_application_set_application_id")
(return-type "none")
(parameters
- '("const-gchar*" "name")
- '("const-gchar*" "description")
+ '("const-gchar*" "application_id")
)
)
-(define-method remove_action
+(define-method get_inactivity_timeout
+ (of-object "GApplication")
+ (c-name "g_application_get_inactivity_timeout")
+ (return-type "guint")
+)
+
+(define-method set_inactivity_timeout
(of-object "GApplication")
- (c-name "g_application_remove_action")
+ (c-name "g_application_set_inactivity_timeout")
(return-type "none")
(parameters
- '("const-gchar*" "name")
+ '("guint" "inactivity_timeout")
)
)
-(define-method list_actions
+(define-method get_flags
(of-object "GApplication")
- (c-name "g_application_list_actions")
- (return-type "gchar**")
+ (c-name "g_application_get_flags")
+ (return-type "GApplicationFlags")
)
-(define-method set_action_enabled
+(define-method set_flags
(of-object "GApplication")
- (c-name "g_application_set_action_enabled")
+ (c-name "g_application_set_flags")
(return-type "none")
(parameters
- '("const-gchar*" "name")
- '("gboolean" "enabled")
+ '("GApplicationFlags" "flags")
)
)
-(define-method get_action_enabled
+(define-method set_action_group
(of-object "GApplication")
- (c-name "g_application_get_action_enabled")
- (return-type "gboolean")
+ (c-name "g_application_set_action_group")
+ (return-type "none")
(parameters
- '("const-gchar*" "name")
+ '("GActionGroup*" "action_group")
)
)
-(define-method get_action_description
+(define-method get_is_registered
(of-object "GApplication")
- (c-name "g_application_get_action_description")
- (return-type "const-gchar*")
+ (c-name "g_application_get_is_registered")
+ (return-type "gboolean")
+)
+
+(define-method get_is_remote
+ (of-object "GApplication")
+ (c-name "g_application_get_is_remote")
+ (return-type "gboolean")
+)
+
+(define-method register
+ (of-object "GApplication")
+ (c-name "g_application_register")
+ (return-type "gboolean")
(parameters
- '("const-gchar*" "name")
+ '("GCancellable*" "cancellable")
+ '("GError**" "error")
)
)
-(define-method invoke_action
+(define-method hold
(of-object "GApplication")
- (c-name "g_application_invoke_action")
+ (c-name "g_application_hold")
(return-type "none")
- (parameters
- '("const-gchar*" "name")
- '("GVariant*" "platform_data")
- )
)
-(define-method run
+(define-method release
(of-object "GApplication")
- (c-name "g_application_run")
+ (c-name "g_application_release")
(return-type "none")
)
-(define-method quit_with_data
+(define-method activate
(of-object "GApplication")
- (c-name "g_application_quit_with_data")
- (return-type "gboolean")
+ (c-name "g_application_activate")
+ (return-type "none")
+)
+
+(define-method open
+ (of-object "GApplication")
+ (c-name "g_application_open")
+ (return-type "none")
(parameters
- '("GVariant*" "platform_data")
+ '("GFile**" "file")
+ '("gint" "n_files")
+ '("const-gchar*" "hint")
)
)
-(define-method is_remote
+(define-method run
(of-object "GApplication")
- (c-name "g_application_is_remote")
- (return-type "gboolean")
+ (c-name "g_application_run")
+ (return-type "int")
+ (parameters
+ '("int" "argc")
+ '("char**" "argv")
+ )
)
-
-
-;; From gasynchelper.h
+(define-method run_with_arguments
+ (of-object "GApplication")
+ (c-name "g_application_run_with_arguments")
+ (return-type "int")
+ (parameters
+ '("GVariant*" "arguments")
+ )
+)
@@ -2404,10 +2321,6 @@
-;; From gcontenttypeprivate.h
-
-
-
;; From gconverter.h
(define-function g_converter_get_type
@@ -2744,6 +2657,44 @@
)
)
+(define-method read_upto
+ (of-object "GDataInputStream")
+ (c-name "g_data_input_stream_read_upto")
+ (return-type "char*")
+ (parameters
+ '("const-gchar*" "stop_chars")
+ '("gssize" "stop_chars_len")
+ '("gsize*" "length")
+ '("GCancellable*" "cancellable")
+ '("GError**" "error")
+ )
+)
+
+(define-method read_upto_async
+ (of-object "GDataInputStream")
+ (c-name "g_data_input_stream_read_upto_async")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "stop_chars")
+ '("gssize" "stop_chars_len")
+ '("gint" "io_priority")
+ '("GCancellable*" "cancellable")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method read_upto_finish
+ (of-object "GDataInputStream")
+ (c-name "g_data_input_stream_read_upto_finish")
+ (return-type "char*")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("gsize*" "length")
+ '("GError**" "error")
+ )
+)
+
;; From gdataoutputstream.h
@@ -2930,26 +2881,6 @@
-;; From gdbusauth.h
-
-
-
-;; From gdbusauthmechanismanon.h
-
-
-
-;; From gdbusauthmechanismexternal.h
-
-
-
-;; From gdbusauthmechanism.h
-
-
-
-;; From gdbusauthmechanismsha1.h
-
-
-
;; From gdbusauthobserver.h
(define-function g_dbus_auth_observer_get_type
@@ -4366,10 +4297,6 @@
-;; From gdbusprivate.h
-
-
-
;; From gdbusproxy.h
(define-function g_dbus_proxy_get_type
@@ -4696,78 +4623,6 @@
-;; From gdelayedsettingsbackend.h
-
-
-
-;; From gdesktopappinfo.h
-
-(define-function g_desktop_app_info_get_type
- (c-name "g_desktop_app_info_get_type")
- (return-type "GType")
-)
-
-(define-function g_desktop_app_info_new_from_filename
- (c-name "g_desktop_app_info_new_from_filename")
- (return-type "GDesktopAppInfo*")
- (parameters
- '("const-char*" "filename")
- )
-)
-
-(define-function g_desktop_app_info_new_from_keyfile
- (c-name "g_desktop_app_info_new_from_keyfile")
- (return-type "GDesktopAppInfo*")
- (parameters
- '("GKeyFile*" "key_file")
- )
-)
-
-(define-method get_filename
- (of-object "GDesktopAppInfo")
- (c-name "g_desktop_app_info_get_filename")
- (return-type "const-char*")
-)
-
-(define-function g_desktop_app_info_new
- (c-name "g_desktop_app_info_new")
- (is-constructor-of "GDesktopAppInfo")
- (return-type "GDesktopAppInfo*")
- (parameters
- '("const-char*" "desktop_id")
- )
-)
-
-(define-method get_is_hidden
- (of-object "GDesktopAppInfo")
- (c-name "g_desktop_app_info_get_is_hidden")
- (return-type "gboolean")
-)
-
-(define-function g_desktop_app_info_set_desktop_env
- (c-name "g_desktop_app_info_set_desktop_env")
- (return-type "none")
- (parameters
- '("const-char*" "desktop_env")
- )
-)
-
-(define-function g_desktop_app_info_lookup_get_type
- (c-name "g_desktop_app_info_lookup_get_type")
- (return-type "GType")
-)
-
-(define-method get_default_for_uri_scheme
- (of-object "GDesktopAppInfoLookup")
- (c-name "g_desktop_app_info_lookup_get_default_for_uri_scheme")
- (return-type "GAppInfo*")
- (parameters
- '("const-char*" "uri_scheme")
- )
-)
-
-
-
;; From gdrive.h
(define-function g_drive_get_type
@@ -4982,14 +4837,6 @@
-;; From gdummyfile.h
-
-
-
-;; From gdummyproxyresolver.h
-
-
-
;; From gemblemedicon.h
(define-function g_emblemed_icon_get_type
@@ -5122,25 +4969,6 @@
-;; From gfileattribute-priv.h
-
-
-
-;; From gfiledescriptorbased.h
-
-(define-function g_file_descriptor_based_get_type
- (c-name "g_file_descriptor_based_get_type")
- (return-type "GType")
-)
-
-(define-method get_fd
- (of-object "GFileDescriptorBased")
- (c-name "g_file_descriptor_based_get_fd")
- (return-type "int")
-)
-
-
-
;; From gfileenumerator.h
(define-function g_file_enumerator_get_type
@@ -7061,10 +6889,6 @@
-;; From gfileinfo-priv.h
-
-
-
;; From gfileinputstream.h
(define-function g_file_input_stream_get_type
@@ -7753,10 +7577,6 @@
-;; From gioalias.h
-
-
-
;; From gioenums.h
@@ -8013,6 +7833,11 @@
(return-type "GType")
)
+(define-function g_application_flags_get_type
+ (c-name "g_application_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")
@@ -8049,10 +7874,6 @@
-;; From gio-marshal.h
-
-
-
;; From giomodule.h
(define-function g_io_module_get_type
@@ -8185,10 +8006,6 @@
-;; From giomodule-priv.h
-
-
-
;; From gioscheduler.h
(define-function g_io_scheduler_push_job
@@ -8360,52 +8177,6 @@
-;; From glocaldirectorymonitor.h
-
-(define-function g_local_directory_monitor_get_type
- (c-name "g_local_directory_monitor_get_type")
- (return-type "GType")
-)
-
-
-
-;; From glocalfileenumerator.h
-
-
-
-;; From glocalfile.h
-
-
-
-;; From glocalfileinfo.h
-
-
-
-;; From glocalfileinputstream.h
-
-
-
-;; From glocalfileiostream.h
-
-
-
-;; From glocalfilemonitor.h
-
-(define-function g_local_file_monitor_get_type
- (c-name "g_local_file_monitor_get_type")
- (return-type "GType")
-)
-
-
-
-;; From glocalfileoutputstream.h
-
-
-
-;; From glocalvfs.h
-
-
-
;; From gmemoryinputstream.h
(define-function g_memory_input_stream_get_type
@@ -8487,10 +8258,6 @@
-;; From gmemorysettingsbackend.h
-
-
-
;; From gmount.h
(define-function g_mount_get_type
@@ -8832,10 +8599,6 @@
-;; From gmountprivate.h
-
-
-
;; From gnativevolumemonitor.h
(define-function g_native_volume_monitor_get_type
@@ -8902,10 +8665,6 @@
-;; From gnetworkingprivate.h
-
-
-
;; From gnetworkservice.h
(define-function g_network_service_get_type
@@ -8959,10 +8718,6 @@
-;; From gnullsettingsbackend.h
-
-
-
;; From goutputstream.h
(define-function g_output_stream_get_type
@@ -9254,10 +9009,6 @@
-;; From gpollfilemonitor.h
-
-
-
;; From gproxyaddressenumerator.h
(define-function g_proxy_address_enumerator_get_type
@@ -9321,10 +9072,6 @@
-;; From gproxyconnection.h
-
-
-
;; From gproxy.h
(define-function g_proxy_get_type
@@ -9436,10 +9183,6 @@
-;; From gregistrysettingsbackend.h
-
-
-
;; From gresolver.h
(define-function g_resolver_get_type
@@ -9724,10 +9467,6 @@
-;; From gsettingsbackendinternal.h
-
-
-
;; From gsettings.h
(define-function g_settings_get_type
@@ -9784,16 +9523,23 @@
(return-type "gchar**")
)
-(define-method get_destroyed
+(define-method get_range
(of-object "GSettings")
- (c-name "g_settings_get_destroyed")
- (return-type "gboolean")
+ (c-name "g_settings_get_range")
+ (return-type "GVariant*")
+ (parameters
+ '("const-gchar*" "key")
+ )
)
-(define-method get_permission
+(define-method range_check
(of-object "GSettings")
- (c-name "g_settings_get_permission")
- (return-type "GPermission*")
+ (c-name "g_settings_range_check")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "key")
+ '("GVariant*" "value")
+ )
)
(define-method set_value
@@ -10088,14 +9834,6 @@
-;; From gsettings-mapping.h
-
-
-
-;; From gsettingsschema.h
-
-
-
;; From gsimpleactiongroup.h
(define-function g_simple_action_group_get_type
@@ -11229,10 +10967,6 @@
-;; From gsocketinputstream.h
-
-
-
;; From gsocketlistener.h
(define-function g_socket_listener_get_type
@@ -11375,10 +11109,6 @@
-;; From gsocketoutputstream.h
-
-
-
;; From gsocketservice.h
(define-function g_socket_service_get_type
@@ -11412,18 +11142,6 @@
-;; From gsocks4aproxy.h
-
-
-
-;; From gsocks4proxy.h
-
-
-
-;; From gsocks5proxy.h
-
-
-
;; From gsrvtarget.h
(define-function g_srv_target_get_type
@@ -11566,15 +11284,6 @@
-;; From gthreadedresolver.h
-
-(define-function g_threaded_resolver_get_type
- (c-name "g_threaded_resolver_get_type")
- (return-type "GType")
-)
-
-
-
;; From gthreadedsocketservice.h
(define-function g_threaded_socket_service_get_type
@@ -11593,608 +11302,6 @@
-;; From gunionvolumemonitor.h
-
-
-
-;; From gunixconnection.h
-
-(define-function g_unix_connection_get_type
- (c-name "g_unix_connection_get_type")
- (return-type "GType")
-)
-
-(define-method send_fd
- (of-object "GUnixConnection")
- (c-name "g_unix_connection_send_fd")
- (return-type "gboolean")
- (parameters
- '("gint" "fd")
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
-(define-method receive_fd
- (of-object "GUnixConnection")
- (c-name "g_unix_connection_receive_fd")
- (return-type "gint")
- (parameters
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
-(define-method send_credentials
- (of-object "GUnixConnection")
- (c-name "g_unix_connection_send_credentials")
- (return-type "gboolean")
- (parameters
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
-(define-method receive_credentials
- (of-object "GUnixConnection")
- (c-name "g_unix_connection_receive_credentials")
- (return-type "GCredentials*")
- (parameters
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
-
-
-;; From gunixcredentialsmessage.h
-
-(define-function g_unix_credentials_message_get_type
- (c-name "g_unix_credentials_message_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_credentials_message_new
- (c-name "g_unix_credentials_message_new")
- (is-constructor-of "GUnixCredentialsMessage")
- (return-type "GSocketControlMessage*")
-)
-
-(define-function g_unix_credentials_message_new_with_credentials
- (c-name "g_unix_credentials_message_new_with_credentials")
- (return-type "GSocketControlMessage*")
- (parameters
- '("GCredentials*" "credentials")
- )
-)
-
-(define-method get_credentials
- (of-object "GUnixCredentialsMessage")
- (c-name "g_unix_credentials_message_get_credentials")
- (return-type "GCredentials*")
-)
-
-(define-function g_unix_credentials_message_is_supported
- (c-name "g_unix_credentials_message_is_supported")
- (return-type "gboolean")
-)
-
-
-
-;; From gunixfdlist.h
-
-(define-function g_unix_fd_list_get_type
- (c-name "g_unix_fd_list_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_fd_list_new
- (c-name "g_unix_fd_list_new")
- (is-constructor-of "GUnixFdList")
- (return-type "GUnixFDList*")
-)
-
-(define-function g_unix_fd_list_new_from_array
- (c-name "g_unix_fd_list_new_from_array")
- (return-type "GUnixFDList*")
- (parameters
- '("const-gint*" "fds")
- '("gint" "n_fds")
- )
-)
-
-(define-method append
- (of-object "GUnixFDList")
- (c-name "g_unix_fd_list_append")
- (return-type "gint")
- (parameters
- '("gint" "fd")
- '("GError**" "error")
- )
-)
-
-(define-method get_length
- (of-object "GUnixFDList")
- (c-name "g_unix_fd_list_get_length")
- (return-type "gint")
-)
-
-(define-method get
- (of-object "GUnixFDList")
- (c-name "g_unix_fd_list_get")
- (return-type "gint")
- (parameters
- '("gint" "index_")
- '("GError**" "error")
- )
-)
-
-(define-method peek_fds
- (of-object "GUnixFDList")
- (c-name "g_unix_fd_list_peek_fds")
- (return-type "const-gint*")
- (parameters
- '("gint*" "length")
- )
-)
-
-(define-method steal_fds
- (of-object "GUnixFDList")
- (c-name "g_unix_fd_list_steal_fds")
- (return-type "gint*")
- (parameters
- '("gint*" "length")
- )
-)
-
-
-
-;; From gunixfdmessage.h
-
-(define-function g_unix_fd_message_get_type
- (c-name "g_unix_fd_message_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_fd_message_new_with_fd_list
- (c-name "g_unix_fd_message_new_with_fd_list")
- (return-type "GSocketControlMessage*")
- (parameters
- '("GUnixFDList*" "fd_list")
- )
-)
-
-(define-function g_unix_fd_message_new
- (c-name "g_unix_fd_message_new")
- (is-constructor-of "GUnixFdMessage")
- (return-type "GSocketControlMessage*")
-)
-
-(define-method get_fd_list
- (of-object "GUnixFDMessage")
- (c-name "g_unix_fd_message_get_fd_list")
- (return-type "GUnixFDList*")
-)
-
-(define-method steal_fds
- (of-object "GUnixFDMessage")
- (c-name "g_unix_fd_message_steal_fds")
- (return-type "gint*")
- (parameters
- '("gint*" "length")
- )
-)
-
-(define-method append_fd
- (of-object "GUnixFDMessage")
- (c-name "g_unix_fd_message_append_fd")
- (return-type "gboolean")
- (parameters
- '("gint" "fd")
- '("GError**" "error")
- )
-)
-
-
-
-;; From gunixinputstream.h
-
-(define-function g_unix_input_stream_get_type
- (c-name "g_unix_input_stream_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_input_stream_new
- (c-name "g_unix_input_stream_new")
- (is-constructor-of "GUnixInputStream")
- (return-type "GInputStream*")
- (parameters
- '("gint" "fd")
- '("gboolean" "close_fd")
- )
-)
-
-(define-method set_close_fd
- (of-object "GUnixInputStream")
- (c-name "g_unix_input_stream_set_close_fd")
- (return-type "none")
- (parameters
- '("gboolean" "close_fd")
- )
-)
-
-(define-method get_close_fd
- (of-object "GUnixInputStream")
- (c-name "g_unix_input_stream_get_close_fd")
- (return-type "gboolean")
-)
-
-(define-method get_fd
- (of-object "GUnixInputStream")
- (c-name "g_unix_input_stream_get_fd")
- (return-type "gint")
-)
-
-
-
-;; From gunixmount.h
-
-
-
-;; From gunixmounts.h
-
-(define-function g_unix_mount_free
- (c-name "g_unix_mount_free")
- (return-type "none")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-method free
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_free")
- (return-type "none")
-)
-
-(define-function g_unix_mount_compare
- (c-name "g_unix_mount_compare")
- (return-type "gint")
- (parameters
- '("GUnixMountEntry*" "mount1")
- '("GUnixMountEntry*" "mount2")
- )
-)
-
-(define-function g_unix_mount_get_mount_path
- (c-name "g_unix_mount_get_mount_path")
- (return-type "const-char*")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_get_device_path
- (c-name "g_unix_mount_get_device_path")
- (return-type "const-char*")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_get_fs_type
- (c-name "g_unix_mount_get_fs_type")
- (return-type "const-char*")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_is_readonly
- (c-name "g_unix_mount_is_readonly")
- (return-type "gboolean")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_is_system_internal
- (c-name "g_unix_mount_is_system_internal")
- (return-type "gboolean")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_guess_can_eject
- (c-name "g_unix_mount_guess_can_eject")
- (return-type "gboolean")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_guess_should_display
- (c-name "g_unix_mount_guess_should_display")
- (return-type "gboolean")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_guess_name
- (c-name "g_unix_mount_guess_name")
- (return-type "char*")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-function g_unix_mount_guess_icon
- (c-name "g_unix_mount_guess_icon")
- (return-type "GIcon*")
- (parameters
- '("GUnixMountEntry*" "mount_entry")
- )
-)
-
-(define-method compare
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_compare")
- (return-type "gint")
- (parameters
- '("GUnixMountPoint*" "mount2")
- )
-)
-
-(define-method get_mount_path
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_get_mount_path")
- (return-type "const-char*")
-)
-
-(define-method get_device_path
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_get_device_path")
- (return-type "const-char*")
-)
-
-(define-method get_fs_type
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_get_fs_type")
- (return-type "const-char*")
-)
-
-(define-method is_readonly
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_is_readonly")
- (return-type "gboolean")
-)
-
-(define-method is_user_mountable
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_is_user_mountable")
- (return-type "gboolean")
-)
-
-(define-method is_loopback
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_is_loopback")
- (return-type "gboolean")
-)
-
-(define-method guess_can_eject
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_guess_can_eject")
- (return-type "gboolean")
-)
-
-(define-method guess_name
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_guess_name")
- (return-type "char*")
-)
-
-(define-method guess_icon
- (of-object "GUnixMountPoint")
- (c-name "g_unix_mount_point_guess_icon")
- (return-type "GIcon*")
-)
-
-(define-function g_unix_mount_points_get
- (c-name "g_unix_mount_points_get")
- (return-type "GList*")
- (parameters
- '("guint64*" "time_read")
- )
-)
-
-(define-function g_unix_mounts_get
- (c-name "g_unix_mounts_get")
- (return-type "GList*")
- (parameters
- '("guint64*" "time_read")
- )
-)
-
-(define-function g_unix_mount_at
- (c-name "g_unix_mount_at")
- (return-type "GUnixMountEntry*")
- (parameters
- '("const-char*" "mount_path")
- '("guint64*" "time_read")
- )
-)
-
-(define-function g_unix_mounts_changed_since
- (c-name "g_unix_mounts_changed_since")
- (return-type "gboolean")
- (parameters
- '("guint64" "time")
- )
-)
-
-(define-function g_unix_mount_points_changed_since
- (c-name "g_unix_mount_points_changed_since")
- (return-type "gboolean")
- (parameters
- '("guint64" "time")
- )
-)
-
-(define-function g_unix_mount_monitor_get_type
- (c-name "g_unix_mount_monitor_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_mount_monitor_new
- (c-name "g_unix_mount_monitor_new")
- (is-constructor-of "GUnixMountMonitor")
- (return-type "GUnixMountMonitor*")
-)
-
-(define-method set_rate_limit
- (of-object "GUnixMountMonitor")
- (c-name "g_unix_mount_monitor_set_rate_limit")
- (return-type "none")
- (parameters
- '("int" "limit_msec")
- )
-)
-
-(define-function g_unix_is_mount_path_system_internal
- (c-name "g_unix_is_mount_path_system_internal")
- (return-type "gboolean")
- (parameters
- '("const-char*" "mount_path")
- )
-)
-
-
-
-;; From gunixoutputstream.h
-
-(define-function g_unix_output_stream_get_type
- (c-name "g_unix_output_stream_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_output_stream_new
- (c-name "g_unix_output_stream_new")
- (is-constructor-of "GUnixOutputStream")
- (return-type "GOutputStream*")
- (parameters
- '("gint" "fd")
- '("gboolean" "close_fd")
- )
-)
-
-(define-method set_close_fd
- (of-object "GUnixOutputStream")
- (c-name "g_unix_output_stream_set_close_fd")
- (return-type "none")
- (parameters
- '("gboolean" "close_fd")
- )
-)
-
-(define-method get_close_fd
- (of-object "GUnixOutputStream")
- (c-name "g_unix_output_stream_get_close_fd")
- (return-type "gboolean")
-)
-
-(define-method get_fd
- (of-object "GUnixOutputStream")
- (c-name "g_unix_output_stream_get_fd")
- (return-type "gint")
-)
-
-
-
-;; From gunixresolver.h
-
-(define-function g_unix_resolver_get_type
- (c-name "g_unix_resolver_get_type")
- (return-type "GType")
-)
-
-
-
-;; From gunixsocketaddress.h
-
-(define-function g_unix_socket_address_get_type
- (c-name "g_unix_socket_address_get_type")
- (return-type "GType")
-)
-
-(define-function g_unix_socket_address_new
- (c-name "g_unix_socket_address_new")
- (is-constructor-of "GUnixSocketAddress")
- (return-type "GSocketAddress*")
- (parameters
- '("const-gchar*" "path")
- )
-)
-
-(define-function g_unix_socket_address_new_abstract
- (c-name "g_unix_socket_address_new_abstract")
- (return-type "GSocketAddress*")
- (parameters
- '("const-gchar*" "path")
- '("gint" "path_len")
- )
-)
-
-(define-function g_unix_socket_address_new_with_type
- (c-name "g_unix_socket_address_new_with_type")
- (return-type "GSocketAddress*")
- (parameters
- '("const-gchar*" "path")
- '("gint" "path_len")
- '("GUnixSocketAddressType" "type")
- )
-)
-
-(define-method get_path
- (of-object "GUnixSocketAddress")
- (c-name "g_unix_socket_address_get_path")
- (return-type "const-char*")
-)
-
-(define-method get_path_len
- (of-object "GUnixSocketAddress")
- (c-name "g_unix_socket_address_get_path_len")
- (return-type "gsize")
-)
-
-(define-method get_address_type
- (of-object "GUnixSocketAddress")
- (c-name "g_unix_socket_address_get_address_type")
- (return-type "GUnixSocketAddressType")
-)
-
-(define-method get_is_abstract
- (of-object "GUnixSocketAddress")
- (c-name "g_unix_socket_address_get_is_abstract")
- (return-type "gboolean")
-)
-
-(define-function g_unix_socket_address_abstract_names_supported
- (c-name "g_unix_socket_address_abstract_names_supported")
- (return-type "gboolean")
-)
-
-
-
-;; From gunixvolume.h
-
-
-
-;; From gunixvolumemonitor.h
-
-
-
;; From gvfs.h
(define-function g_vfs_get_type
@@ -12451,112 +11558,6 @@
-;; From gwin32appinfo.h
-
-(define-function g_win32_app_info_get_type
- (c-name "g_win32_app_info_get_type")
- (return-type "GType")
-)
-
-
-
-;; From gwin32inputstream.h
-
-(define-function g_win32_input_stream_get_type
- (c-name "g_win32_input_stream_get_type")
- (return-type "GType")
-)
-
-(define-function g_win32_input_stream_new
- (c-name "g_win32_input_stream_new")
- (is-constructor-of "GWin32InputStream")
- (return-type "GInputStream*")
- (parameters
- '("void*" "handle")
- '("gboolean" "close_handle")
- )
-)
-
-(define-method set_close_handle
- (of-object "GWin32InputStream")
- (c-name "g_win32_input_stream_set_close_handle")
- (return-type "none")
- (parameters
- '("gboolean" "close_handle")
- )
-)
-
-(define-method get_close_handle
- (of-object "GWin32InputStream")
- (c-name "g_win32_input_stream_get_close_handle")
- (return-type "gboolean")
-)
-
-(define-method get_handle
- (of-object "GWin32InputStream")
- (c-name "g_win32_input_stream_get_handle")
- (return-type "void*")
-)
-
-
-
-;; From gwin32mount.h
-
-
-
-;; From gwin32outputstream.h
-
-(define-function g_win32_output_stream_get_type
- (c-name "g_win32_output_stream_get_type")
- (return-type "GType")
-)
-
-(define-function g_win32_output_stream_new
- (c-name "g_win32_output_stream_new")
- (is-constructor-of "GWin32OutputStream")
- (return-type "GOutputStream*")
- (parameters
- '("void*" "handle")
- '("gboolean" "close_handle")
- )
-)
-
-(define-method set_close_handle
- (of-object "GWin32OutputStream")
- (c-name "g_win32_output_stream_set_close_handle")
- (return-type "none")
- (parameters
- '("gboolean" "close_handle")
- )
-)
-
-(define-method get_close_handle
- (of-object "GWin32OutputStream")
- (c-name "g_win32_output_stream_get_close_handle")
- (return-type "gboolean")
-)
-
-(define-method get_handle
- (of-object "GWin32OutputStream")
- (c-name "g_win32_output_stream_get_handle")
- (return-type "void*")
-)
-
-
-
-;; From gwin32resolver.h
-
-(define-function g_win32_resolver_get_type
- (c-name "g_win32_resolver_get_type")
- (return-type "GType")
-)
-
-
-
-;; From gwin32volumemonitor.h
-
-
-
;; From gzlibcompressor.h
(define-function g_zlib_compressor_get_type
diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index e720f5b..55653a6 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -2,87 +2,90 @@
;; From GApplication
-(define-signal quit-with-data
+(define-signal startup
(of-object "GApplication")
- (return-type "gboolean")
+ (return-type "void")
(when "last")
- (parameters
- '("GVariant*" "p0")
- )
)
-(define-signal action-with-data
+(define-signal activate
(of-object "GApplication")
(return-type "void")
- (when "first")
+ (when "last")
+)
+
+(define-signal open
+ (of-object "GApplication")
+ (return-type "void")
+ (when "last")
(parameters
- '("const-gchar*" "p0")
- '("GVariant*" "p1")
+ '("gpointer" "p0")
+ '("gint" "p1")
+ '("const-gchar*" "p2")
)
)
-(define-signal prepare-activation
+(define-signal command-line
(of-object "GApplication")
- (return-type "void")
+ (return-type "gint")
(when "last")
(parameters
- '("GVariant*" "p0")
- '("GVariant*" "p1")
+ '("GApplicationCommandLine*" "p0")
)
)
(define-property application-id
(of-object "GApplication")
(prop-type "GParamString")
- (docs "Identifier for this application")
+ (docs "Unique identifier for the application")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-(define-property register
+(define-property flags
(of-object "GApplication")
- (prop-type "GParamBoolean")
- (docs "If false, do not ")
+ (prop-type "GParamFlags")
+ (docs "Flags specifying the behaviour of the application")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-(define-property default-quit
+(define-property is-registered
(of-object "GApplication")
(prop-type "GParamBoolean")
- (docs "Exit the process by default")
+ (docs "If g_application_register() has been called")
(readable #t)
- (writable #t)
- (construct-only #t)
+ (writable #f)
+ (construct-only #f)
)
(define-property is-remote
(of-object "GApplication")
(prop-type "GParamBoolean")
- (docs "Whether this application is a proxy for another process")
+ (docs "If this application instance is remote")
(readable #t)
(writable #f)
(construct-only #f)
)
-(define-property argv
+(define-property inactivity-timeout
(of-object "GApplication")
- (prop-type "GParamVariant")
- (docs "System argument vector with type signature aay")
+ (prop-type "GParamBoolean")
+ (docs "time (ms) to stay alive after becoming idle")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
-(define-property platform-data
+(define-property action-group
(of-object "GApplication")
- (prop-type "GParamVariant")
- (docs "Environmental data, must have type signature a{sv}")
- (readable #t)
+ (prop-type "GParamObject")
+ (docs "the group of actions that the application exports")
+ (readable #f)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
;; From GCancellable
@@ -520,7 +523,7 @@
)
)
-;; p1 is actually a gchar**,
+;; p1 is actually a gchar**,
;; but that is equivalent (by typedef) to gchar**,
;; and the declaration in gmountoperation.h adds a const.
;; murrayc
@@ -962,7 +965,7 @@
(define-signal new-connection
(of-object "GDBusServer")
- (return-type "void")
+ (return-type "gboolean")
(when "last")
(parameters
'("GDBusConnection*" "p0")
@@ -1236,22 +1239,22 @@
(construct-only #t)
)
-(define-property scheme
+(define-property domain
(of-object "GNetworkService")
(prop-type "GParamString")
- (docs "Network scheme (default is to use service)")
+ (docs "Network domain, eg, 'example.com'")
(readable #t)
(writable #t)
- (construct-only #f)
+ (construct-only #t)
)
-(define-property domain
+(define-property scheme
(of-object "GNetworkService")
(prop-type "GParamString")
- (docs "Network domain, eg, 'example.com'")
+ (docs "Network scheme (default is to use service)")
(readable #t)
(writable #t)
- (construct-only #t)
+ (construct-only #f)
)
;; From GSettings
@@ -1661,5 +1664,3 @@
(writable #t)
(construct-only #t)
)
-
-
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4
index 2550764..dcae92e 100644
--- a/tools/m4/convert_gio.m4
+++ b/tools/m4/convert_gio.m4
@@ -1,4 +1,5 @@
_CONV_ENUM(G,AppInfoCreateFlags)
+_CONV_ENUM(G,ApplicationFlags)
_CONV_ENUM(G,AskPasswordFlags)
_CONV_ENUM(G,CredentialsType)
_CONV_ENUM(G,DataStreamByteOrder)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
