[glibmm] Wrapped new glib-2.26 methods.
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Wrapped new glib-2.26 methods.
- Date: Tue, 1 Jun 2010 00:48:25 +0000 (UTC)
commit 81df82ed68517f9c1def2b2caf5cf9f651f22b5f
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Mon May 31 20:45:17 2010 -0400
Wrapped new glib-2.26 methods.
* configure.ac: Bump the glib requirement up to 2.25.7 because of the
new methods that are wrapped.
* glib/src/glib_docs.xml:
* glib/src/glib_functions.defs: Regenerate to get new methods and the
docs for them.
* glib/src/keyfile.ccg:
* glib/src/keyfile.hg (get_boolean): Added method overload (as other
get_*() methods have).
(get_int64, get_uint64, set_int64, set_uint64):
* glib/src/regex.hg (get_compile_flags, get_match_flags): Wrapped new
methods.
* gio/src/settings.hg:
* gio/src/socket.hg: Add some forgotten _IGNORE's and @newin{}'s.
ChangeLog | 18 +
configure.ac | 2 +-
gio/src/settings.hg | 8 +
gio/src/socket.hg | 5 +
glib/src/glib_docs.xml | 754 ++++++++++++++++++++++++++++++------------
glib/src/glib_functions.defs | 494 +++++++++++-----------------
glib/src/keyfile.ccg | 38 +++
glib/src/keyfile.hg | 44 +++
glib/src/regex.hg | 2 +
9 files changed, 844 insertions(+), 521 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index be45d24..fe511a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-05-31 José Alburquerque <jaalburqu svn gnome org>
+
+ Wrapped new glib-2.26 methods.
+
+ * configure.ac: Bump the glib requirement up to 2.25.7 because of the
+ new methods that are wrapped.
+ * glib/src/glib_docs.xml:
+ * glib/src/glib_functions.defs: Regenerate to get new methods and the
+ docs for them.
+ * glib/src/keyfile.ccg:
+ * glib/src/keyfile.hg (get_boolean): Added method overload (as other
+ get_*() methods have).
+ (get_int64, get_uint64, set_int64, set_uint64):
+ * glib/src/regex.hg (get_compile_flags, get_match_flags): Wrapped new
+ methods.
+ * gio/src/settings.hg:
+ * gio/src/socket.hg: Add some forgotten _IGNORE's and @newin{}'s.
+
2010-05-31 Murray Cumming <murrayc murrayc com>
Remove the reduced API options and code, as discussed on mailing list.
diff --git a/configure.ac b/configure.ac
index 1fcf868..b49055a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AS_IF([test "x$enable_static" = xyes],
AC_DEFINE([GIOMM_STATIC_LIB], [1], [Define if giomm is built as a static library])
])
-glibreq='2.0 >= 2.25.1'
+glibreq='2.0 >= 2.25.7'
GLIBMM_MODULES="sigc++-2.0 >= 2.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 55acb27..b21c7cd 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -66,6 +66,8 @@ public:
*
* @param key The key to get the value for.
* @return a newly-allocated, <tt>0</tt>-terminated array of strings.
+ *
+ * @newin{2,26}
*/
Glib::ArrayHandle<Glib::ustring> get_strv(const Glib::ustring& key) const;
_IGNORE(g_settings_get_strv)
@@ -78,9 +80,15 @@ public:
* @param value The value to set it to.
* @return <tt>true</tt> if setting the key succeeded, <tt>false</tt> if the
* key was not writable.
+ *
+ * @newin{2,26}
*/
bool set_strv(const Glib::ustring& key,
const Glib::ArrayHandle<Glib::ustring>& value);
+ _IGNORE(g_settings_set_strv)
+
+ // Ignore varargs functions.
+ _IGNORE(g_settings_get, g_settings_set)
_WRAP_METHOD(Glib::RefPtr<Settings> get_child(const Glib::ustring& name), g_settings_get_child)
_WRAP_METHOD(Glib::RefPtr<const Settings> get_child(const Glib::ustring& name) const, g_settings_get_child, constversion)
diff --git a/gio/src/socket.hg b/gio/src/socket.hg
index 30df9db..0320ef8 100644
--- a/gio/src/socket.hg
+++ b/gio/src/socket.hg
@@ -103,6 +103,11 @@ public:
create(SocketFamily family, SocketType type, SocketProtocol protocol,
const Glib::RefPtr<Cancellable>& cancellable = Glib::RefPtr<Cancellable>());
+ // gmmproc thinks that this function should be wrapped in this class because
+ // its only parameter is a GSocket. In fact, it is wrapped in the
+ // SocketConnection class.
+ _IGNORE(g_socket_connection_factory_create_connection)
+
_WRAP_METHOD_DOCS_ONLY(g_socket_new_from_fd)
/** @throw Glib::Error
*/
diff --git a/glib/src/glib_docs.xml b/glib/src/glib_docs.xml
index 6204904..76dac2b 100644
--- a/glib/src/glib_docs.xml
+++ b/glib/src/glib_docs.xml
@@ -496,6 +496,33 @@ it is always UTF-8. The return value is never %NULL.
</return>
</function>
+<function name="g_node_copy_deep">
+<description>
+Recursively copies a #GNode and its data.
+
+Since: 2.4
+
+</description>
+<parameters>
+<parameter name="node">
+<parameter_description> a #GNode
+</parameter_description>
+</parameter>
+<parameter name="copy_func">
+<parameter_description> the function which is called to copy the data inside each node,
+or %NULL to use the original data.
+</parameter_description>
+</parameter>
+<parameter name="data">
+<parameter_description> data to pass to @copy_func
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new #GNode containing copies of the data in @node.
+
+</return>
+</function>
+
<function name="g_variant_ref_sink">
<description>
#GVariant uses a floating reference count system. All functions with
@@ -1111,38 +1138,12 @@ or freed.
<function name="g_dgettext">
<description>
-This function is a wrapper of dgettext() which does not translate
-the message if the default domain as set with textdomain() has no
-translations for the current locale.
-
-The advantage of using this function over dgettext() proper is that
-libraries using this function (like GTK+) will not use translations
-if the application using the library does not have translations for
-the current locale. This results in a consistent English-only
-interface instead of one having partial translations. For this
-feature to work, the call to textdomain() and setlocale() should
-precede any g_dgettext() invocations. For GTK+, it means calling
-textdomain() before gtk_init or its variants.
-
-This function disables translations if and only if upon its first
-call all the following conditions hold:
-<itemizedlist>
-<listitem>@domain is not %NULL</listitem>
-<listitem>textdomain() has been called to set a default text domain</listitem>
-<listitem>there is no translations available for the default text domain
-and the current locale</listitem>
-<listitem>current locale is not "C" or any English locales (those
-starting with "en_")</listitem>
-</itemizedlist>
+This is a variant of g_dgettext() that allows specifying a locale
+category instead of always using %LC_MESSAGES. See g_dgettext() for
+more information about how this functions differs from calling
+dcgettext() directly.
-Note that this behavior may not be desired for example if an application
-has its untranslated messages in a language other than English. In those
-cases the application should call textdomain() after initializing GTK+.
-
-Applications should normally not use this function directly,
-but use the _() macro for translations.
-
-Since: 2.18
+Since: 2.26
</description>
<parameters>
@@ -1155,8 +1156,12 @@ the domain set with textdomain()
<parameter_description> message to translate
</parameter_description>
</parameter>
+<parameter name="category">
+<parameter_description> a locale category
+</parameter_description>
+</parameter>
</parameters>
-<return> The translated string
+<return> the translated string for the given locale category
</return>
</function>
@@ -1679,7 +1684,7 @@ might themselves contain markup.
const char *store = "Fortnum & Mason";
const char *item = "Tea";
char *output;
-
+ 
output = g_markup_printf_escaped ("<purchase>"
"<store>%s</store>"
"<item>%s</item>"
@@ -3183,6 +3188,26 @@ in the given field.
</return>
</function>
+<function name="g_cache_remove">
+<description>
+Decreases the reference count of the given value. If it drops to 0
+then the value and its corresponding key are destroyed, using the
+ value_destroy_func and @key_destroy_func passed to g_cache_new().
+
+</description>
+<parameters>
+<parameter name="cache">
+<parameter_description> a #GCache.
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> the value to remove.
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="g_io_channel_write">
<description>
Writes data to a #GIOChannel.
@@ -5405,6 +5430,39 @@ Since: 2.24
</return>
</function>
+<function name="g_variant_get_byte_array">
+<description>
+Gets the contents of an array of bytes #GVariant.
+
+If @length is non-%NULL then it points to a location at which to
+store the length of the array and nul bytes contained within the
+array have no special meaning.
+
+If @length is %NULL then the caller has no way to determine what the
+length of the returned data might be. In this case, the function
+ensures that the last byte of the array is a nul byte and, if it is
+not, returns %NULL instead. In this way, the caller is assured that
+any non-%NULL pointer that is returned will be nul-terminated.
+
+The return value remains valid as long as @value exists.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="value">
+<parameter_description> an array of bytes #GVariant
+</parameter_description>
+</parameter>
+<parameter name="length">
+<parameter_description> the length of the result, or %NULL
+</parameter_description>
+</parameter>
+</parameters>
+<return> a pointer to the byte data, or %NULL
+</return>
+</function>
+
<function name="g_cclosure_marshal_VOID__ENUM">
<description>
A marshaller for a #GCClosure with a callback of type
@@ -5719,6 +5777,35 @@ the returned string
</return>
</function>
+<function name="g_key_file_set_uint64">
+<description>
+Associates a new integer value with @key under @group_name.
+If @key cannot be found then it is created.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="key_file">
+<parameter_description> a #GKeyFile
+</parameter_description>
+</parameter>
+<parameter name="group_name">
+<parameter_description> a group name
+</parameter_description>
+</parameter>
+<parameter name="key">
+<parameter_description> a key
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> an integer value
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="g_hash_table_iter_next">
<description>
Advances @iter and retrieves the key and/or value that are now
@@ -6348,7 +6435,7 @@ print_uppercase_words (const gchar *string)
/ * Print all uppercase-only words. * /
GRegex *regex;
GMatchInfo *match_info;
-
+ 
regex = g_regex_new ("[A-Z]+", 0, 0, NULL);
g_regex_match (regex, string, 0, &match_info);
while (g_match_info_matches (match_info))
@@ -7292,24 +7379,37 @@ Since: 2.6
<return></return>
</function>
-<function name="g_cache_remove">
+<function name="g_key_file_get_int64">
<description>
-Decreases the reference count of the given value. If it drops to 0
-then the value and its corresponding key are destroyed, using the
- value_destroy_func and @key_destroy_func passed to g_cache_new().
+Returns the value associated with @key under @group_name as a signed
+64-bit integer. This is similar to g_key_file_get_integer() but can return
+64-bit results without truncation.
+
+Since: 2.26
</description>
<parameters>
-<parameter name="cache">
-<parameter_description> a #GCache.
+<parameter name="key_file">
+<parameter_description> a non-%NULL #GKeyFile
</parameter_description>
</parameter>
-<parameter name="value">
-<parameter_description> the value to remove.
+<parameter name="group_name">
+<parameter_description> a non-%NULL group name
+</parameter_description>
+</parameter>
+<parameter name="key">
+<parameter_description> a non-%NULL key
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> return location for a #GError
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> the value associated with the key as a signed 64-bit integer, or
+0 if the key was not found or could not be parsed.
+
+</return>
</function>
<function name="g_get_language_names">
@@ -8007,6 +8107,8 @@ Returns the string value of a #GVariant instance with a string
type. This includes the types %G_VARIANT_TYPE_STRING,
%G_VARIANT_TYPE_OBJECT_PATH and %G_VARIANT_TYPE_SIGNATURE.
+The string will always be utf8 encoded.
+
If @length is non-%NULL then the length of the string (in bytes) is
returned there. For trusted values, this information is already
known. For untrusted values, a strlen() will be performed.
@@ -8029,7 +8131,7 @@ Since: 2.24
</parameter_description>
</parameter>
</parameters>
-<return> the constant string
+<return> the constant string, utf8 encoded
</return>
</function>
@@ -9112,6 +9214,22 @@ Set the contents of a %G_TYPE_BOOLEAN #GValue to @v_boolean.
<return></return>
</function>
+<function name="g_thread_supported">
+<description>
+This function returns %TRUE if the thread system is initialized, and
+%FALSE if it is not.
+
+<note><para>This function is actually a macro. Apart from taking the
+address of it you can however use it as if it was a
+function.</para></note>
+
+</description>
+<parameters>
+</parameters>
+<return> %TRUE, if the thread system is initialized.
+</return>
+</function>
+
<function name="g_value_set_string_take_ownership">
<description>
This is an internal function introduced mainly for C marshallers.
@@ -9217,6 +9335,47 @@ URI, or %NULL on an error.
</return>
</function>
+<function name="g_variant_compare">
+<description>
+Compares @one and @two.
+
+The types of @one and @two are #gconstpointer only to allow use of
+this function with #GTree, #GPtrArray, etc. They must each be a
+#GVariant.
+
+Comparison is only defined for basic types (ie: booleans, numbers,
+strings). For booleans, %FALSE is less than %TRUE. Numbers are
+ordered in the usual way. Strings are in ASCII lexographical order.
+
+It is a programmer error to attempt to compare container values or
+two values that have types that are not exactly equal. For example,
+you can not compare a 32-bit signed integer with a 32-bit unsigned
+integer. Also note that this function is not particularly
+well-behaved when it comes to comparison of doubles; in particular,
+the handling of incomparable values (ie: NaN) is undefined.
+
+If you only require an equality comparison, g_variant_equal() is more
+general.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="one">
+<parameter_description> a basic-typed #GVariant instance
+</parameter_description>
+</parameter>
+<parameter name="two">
+<parameter_description> a #GVariant instance of the same type
+</parameter_description>
+</parameter>
+</parameters>
+<return> negative value if a < b;
+zero if a = b;
+positive value if a > b.
+</return>
+</function>
+
<function name="g_uri_escape_string">
<description>
Escapes a string for use in a URI.
@@ -9238,7 +9397,7 @@ Since: 2.16
</parameter>
<parameter name="reserved_chars_allowed">
<parameter_description> a string of reserved characters that are
-allowed to be used.
+allowed to be used, or %NULL.
</parameter_description>
</parameter>
<parameter name="allow_utf8">
@@ -9706,7 +9865,7 @@ print_uppercase_words (const gchar *string)
GRegex *regex;
GMatchInfo *match_info;
GError *error = NULL;
-
+ 
regex = g_regex_new ("[A-Z]+", 0, 0, NULL);
g_regex_match_full (regex, string, -1, 0, 0, &match_info, &error);
while (g_match_info_matches (match_info))
@@ -10689,14 +10848,10 @@ the comparison routine accepts a user data argument.
<description>
Ends the builder process and returns the constructed value.
-This call automatically reduces the reference count on @builder by
-one, unless it has previously had g_variant_builder_no_autofree()
-called on it. Unless you've taken other actions, this is usually
-sufficient to free @builder.
-
-Even if additional references are held, it is not permissible to use
- builder in any way after this call except for further reference
-counting operations.
+It is not permissible to use @builder in any way after this call
+except for reference counting operations (in the case of a
+heap-allocated #GVariantBuilder) or by reinitialising it with
+g_variant_builder_init() (in the case of stack-allocated).
It is an error to call this function in any way that would create an
inconsistent value to be constructed (ie: insufficient number of
@@ -10974,30 +11129,44 @@ data may be fed to the #GMarkupParseContext; all errors are fatal.
</return>
</function>
-<function name="g_node_copy_deep">
+<function name="g_io_add_watch_full">
<description>
-Recursively copies a #GNode and its data.
+Adds the #GIOChannel into the default main loop context
+with the given priority.
+
+This internally creates a main loop source using g_io_create_watch()
+and attaches it to the main loop context with g_source_attach().
+You can do these steps manuallt if you need greater control.
-Since: 2.4
</description>
<parameters>
-<parameter name="node">
-<parameter_description> a #GNode
+<parameter name="channel">
+<parameter_description> a #GIOChannel
</parameter_description>
</parameter>
-<parameter name="copy_func">
-<parameter_description> the function which is called to copy the data inside each node,
-or %NULL to use the original data.
+<parameter name="priority">
+<parameter_description> the priority of the #GIOChannel source
</parameter_description>
</parameter>
-<parameter name="data">
-<parameter_description> data to pass to @copy_func
+<parameter name="condition">
+<parameter_description> the condition to watch for
+</parameter_description>
+</parameter>
+<parameter name="func">
+<parameter_description> the function to call when the condition is satisfied
+</parameter_description>
+</parameter>
+<parameter name="user_data">
+<parameter_description> user data to pass to @func
+</parameter_description>
+</parameter>
+<parameter name="notify">
+<parameter_description> the function to call when the source is removed
</parameter_description>
</parameter>
</parameters>
-<return> a new #GNode containing copies of the data in @node.
-
+<return> the event source id
</return>
</function>
@@ -12931,6 +13100,20 @@ the C library checks only the FAT-style READONLY attribute and does
not look at the ACL at all. Thus on Windows the protection bits in
the st_mode field are a fabrication of little use.
+On Windows the Microsoft C libraries have several variants of the
+<structname>stat</structname> struct and stat() function with names
+like "_stat", "_stat32", "_stat32i64" and "_stat64i32". The one
+used here is for 32-bit code the one with 32-bit size and time
+fields, specifically called "_stat32".
+
+In Microsoft's compiler, by default "struct stat" means one with
+64-bit time fields while in MinGW "struct stat" is the legacy one
+with 32-bit fields. To hopefully clear up this messs, the gstdio.h
+header defines a type GStatBuf which is the appropriate struct type
+depending on the platform and/or compiler being used. On POSIX it
+is just "struct stat", but note that even on POSIX platforms,
+"stat" might be a macro.
+
See your C library manual for more details about stat().
Since: 2.6
@@ -14561,6 +14744,29 @@ Since: 2.4
<return></return>
</function>
+<function name="g_source_set_name_by_id">
+<description>
+Sets the name of a source using its ID.
+
+This is a convenience utility to set source names from the return
+value of g_idle_add(), g_timeout_add(), etc.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="tag">
+<parameter_description> a #GSource ID
+</parameter_description>
+</parameter>
+<parameter name="name">
+<parameter_description> debug name for the source
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="g_string_append_c">
<description>
Adds a byte onto the end of a #GString, expanding
@@ -14722,6 +14928,8 @@ lock @lock for reading.
Similar to g_variant_get_string() except that instead of returning
a constant string, the string is duplicated.
+The string will always be utf8 encoded.
+
The return value must be freed using g_free().
Since: 2.24
@@ -14737,7 +14945,7 @@ Since: 2.24
</parameter_description>
</parameter>
</parameters>
-<return> a newly allocated string
+<return> a newly allocated string, utf8 encoded
</return>
</function>
@@ -16902,6 +17110,36 @@ Since: 2.6
</return>
</function>
+<function name="g_source_set_name">
+<description>
+Sets a name for the source, used in debugging and profiling.
+The name defaults to #NULL.
+
+The source name should describe in a human-readable way
+what the source does. For example, "X11 event queue"
+or "GTK+ repaint idle handler" or whatever it is.
+
+It is permitted to call this function multiple times, but is not
+recommended due to the potential performance impact. For example,
+one could change the name in the "check" function of a #GSourceFuncs
+to include details like the event type in the source name.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="source">
+<parameter_description> a #GSource
+</parameter_description>
+</parameter>
+<parameter name="name">
+<parameter_description> debug name for the source
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="g_value_set_uint64">
<description>
Set the contents of a %G_TYPE_UINT64 #GValue to @v_uint64.
@@ -17864,7 +18102,7 @@ Since: 2.16
</parameter_description>
</parameter>
<parameter name="reserved_chars_allowed">
-<parameter_description> a string of reserved characters allowed to be used
+<parameter_description> a string of reserved characters allowed to be used, or %NULL
</parameter_description>
</parameter>
<parameter name="allow_utf8">
@@ -18989,13 +19227,13 @@ was not found.
<function name="g_string_insert_len">
<description>
-Inserts @len bytes of @val into @string at @pos.
-Because @len is provided, @val may contain embedded
-nuls and need not be nul-terminated. If @pos is -1,
+Inserts @len bytes of @val into @string at @pos.
+Because @len is provided, @val may contain embedded
+nuls and need not be nul-terminated. If @pos is -1,
bytes are inserted at the end of the string.
-Since this function does not stop at nul bytes, it is
-the caller's responsibility to ensure that @val has at
+Since this function does not stop at nul bytes, it is
+the caller's responsibility to ensure that @val has at
least @len addressable bytes.
@@ -19006,7 +19244,7 @@ least @len addressable bytes.
</parameter_description>
</parameter>
<parameter name="pos">
-<parameter_description> position in @string where insertion should
+<parameter_description> position in @string where insertion should
happen, or -1 for at the end
</parameter_description>
</parameter>
@@ -20104,6 +20342,42 @@ The current implementation uses Quick-Sort as sorting algorithm.
</return>
</function>
+<function name="g_cclosure_marshal_VOID__UCHAR">
+<description>
+A marshaller for a #GCClosure with a callback of type
+<literal>void (*callback) (gpointer instance, guchar arg1, gpointer user_data)</literal>.
+
+</description>
+<parameters>
+<parameter name="closure">
+<parameter_description> the #GClosure to which the marshaller belongs
+</parameter_description>
+</parameter>
+<parameter name="return_value">
+<parameter_description> ignored
+</parameter_description>
+</parameter>
+<parameter name="n_param_values">
+<parameter_description> 2
+</parameter_description>
+</parameter>
+<parameter name="param_values">
+<parameter_description> a #GValue array holding the instance and the #guchar parameter
+</parameter_description>
+</parameter>
+<parameter name="invocation_hint">
+<parameter_description> the invocation hint given as the last argument
+to g_closure_invoke()
+</parameter_description>
+</parameter>
+<parameter name="marshal_data">
+<parameter_description> additional data specified when registering the marshaller
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="g_variant_get_child_value">
<description>
Reads a child item out of a container #GVariant instance. This
@@ -21402,19 +21676,22 @@ Since: 2.24
</return>
</function>
-<function name="g_thread_supported">
+<function name="g_source_get_name">
<description>
-This function returns %TRUE if the thread system is initialized, and
-%FALSE if it is not.
+Gets a name for the source, used in debugging and profiling.
+The name may be #NULL if it has never been set with
+g_source_set_name().
-<note><para>This function is actually a macro. Apart from taking the
-address of it you can however use it as if it was a
-function.</para></note>
+Since: 2.26
</description>
<parameters>
+<parameter name="source">
+<parameter_description> a #GSource
+</parameter_description>
+</parameter>
</parameters>
-<return> %TRUE, if the thread system is initialized.
+<return> the name of the source
</return>
</function>
@@ -23392,36 +23669,21 @@ or %FALSE if the key was not found or could not be parsed.
</return>
</function>
-<function name="g_variant_new">
+<function name="g_value_array_new">
<description>
-Creates a new #GVariant instance.
-
-Think of this function as an analogue to g_strdup_printf().
-
-The type of the created instance and the arguments that are
-expected by this function are determined by @format_string. See the
-section on <link linkend='gvariant-format-strings'>GVariant Format
-Strings</link>. Please note that the syntax of the format string is
-very likely to be extended in the future.
-
-The first character of the format string must not be '*' '?' '@' or
-'r'; in essence, a new #GVariant must always be constructed by this
-function (and not merely passed through it unmodified).
+Allocate and initialize a new #GValueArray, optionally preserve space
+for @n_prealloced elements. New arrays always contain 0 elements,
+regardless of the value of @n_prealloced.
-Since: 2.24
</description>
<parameters>
-<parameter name="format_string">
-<parameter_description> a #GVariant format string
-</parameter_description>
-</parameter>
-<parameter name="Varargs">
-<parameter_description> arguments, as per @format_string
+<parameter name="n_prealloced">
+<parameter_description> number of values to preallocate space for
</parameter_description>
</parameter>
</parameters>
-<return> a new floating #GVariant instance
+<return> a newly allocated #GValueArray with 0 values
</return>
</function>
@@ -23706,22 +23968,33 @@ Destroys the #GCond.
<return></return>
</function>
-<function name="g_value_array_new">
+<function name="g_key_file_set_int64">
<description>
-Allocate and initialize a new #GValueArray, optionally preserve space
-for @n_prealloced elements. New arrays always contain 0 elements,
-regardless of the value of @n_prealloced.
+Associates a new integer value with @key under @group_name.
+If @key cannot be found then it is created.
+Since: 2.26
</description>
<parameters>
-<parameter name="n_prealloced">
-<parameter_description> number of values to preallocate space for
+<parameter name="key_file">
+<parameter_description> a #GKeyFile
+</parameter_description>
+</parameter>
+<parameter name="group_name">
+<parameter_description> a group name
+</parameter_description>
+</parameter>
+<parameter name="key">
+<parameter_description> a key
+</parameter_description>
+</parameter>
+<parameter name="value">
+<parameter_description> an integer value
</parameter_description>
</parameter>
</parameters>
-<return> a newly allocated #GValueArray with 0 values
-</return>
+<return></return>
</function>
<function name="g_strv_length">
@@ -24769,6 +25042,24 @@ created. Returns -1 if an error occurred, with errno set.
</return>
</function>
+<function name="g_regex_get_compile_flags">
+<description>
+Returns the compile options that @regex was created with.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="regex">
+<parameter_description> a #GRegex
+</parameter_description>
+</parameter>
+</parameters>
+<return> flags from #GRegexCompileFlags
+
+</return>
+</function>
+
<function name="g_queue_copy">
<description>
Copies a @queue. Note that is a shallow copy. If the elements in the
@@ -27132,6 +27423,24 @@ Since: 2.6
</return>
</function>
+<function name="g_regex_get_match_flags">
+<description>
+Returns the match options that @regex was created with.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="regex">
+<parameter_description> a #GRegex
+</parameter_description>
+</parameter>
+</parameters>
+<return> flags from #GRegexMatchFlags
+
+</return>
+</function>
+
<function name="g_utf16_to_ucs4">
<description>
Convert a string from UTF-16 to UCS-4. The result will be
@@ -28574,8 +28883,7 @@ make_pointless_dictionary (void)
GVariantBuilder *builder;
int i;
-builder = g_variant_builder_new (G_VARIANT_TYPE_CLASS_ARRAY,
-NULL);
+builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
for (i = 0; i < 16; i++)
{
gchar buf[3];
@@ -31339,7 +31647,7 @@ Since: 2.24
</description>
<parameters>
<parameter name="type">
-<parameter_description> a #GVariantType
+<parameter_description> a definite #GVariantType
</parameter_description>
</parameter>
<parameter name="data">
@@ -33325,8 +33633,8 @@ The original intended use of @package was for a short identifier of
the package, typically the same identifier as used for
<literal>GETTEXT_PACKAGE</literal> in software configured using GNU
autotools. The function first looks in the Windows Registry for the
-value <literal>InstallationDirectory</literal> in the key
-<literal>HKLM\Software\ package</literal>, and if that value
+value <literal>#InstallationDirectory</literal> in the key
+<literal>#HKLM\Software\ package</literal>, and if that value
exists and is a string, returns that.
It is strongly recommended that packagers of GLib-using libraries
@@ -33921,6 +34229,39 @@ Frees the memory allocated for the #GRand.
<return></return>
</function>
+<function name="g_key_file_get_uint64">
+<description>
+Returns the value associated with @key under @group_name as an unsigned
+64-bit integer. This is similar to g_key_file_get_integer() but can return
+large positive results without truncation.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="key_file">
+<parameter_description> a non-%NULL #GKeyFile
+</parameter_description>
+</parameter>
+<parameter name="group_name">
+<parameter_description> a non-%NULL group name
+</parameter_description>
+</parameter>
+<parameter name="key">
+<parameter_description> a non-%NULL key
+</parameter_description>
+</parameter>
+<parameter name="error">
+<parameter_description> return location for a #GError
+</parameter_description>
+</parameter>
+</parameters>
+<return> the value associated with the key as an unsigned 64-bit integer,
+or 0 if the key was not found or could not be parsed.
+
+</return>
+</function>
+
<function name="g_key_file_get_groups">
<description>
Returns all groups in the key file loaded with @key_file.
@@ -34589,6 +34930,39 @@ Get the contents of a %G_TYPE_ENUM #GValue.
</return>
</function>
+<function name="g_variant_new">
+<description>
+Creates a new #GVariant instance.
+
+Think of this function as an analogue to g_strdup_printf().
+
+The type of the created instance and the arguments that are
+expected by this function are determined by @format_string. See the
+section on <link linkend='gvariant-format-strings'>GVariant Format
+Strings</link>. Please note that the syntax of the format string is
+very likely to be extended in the future.
+
+The first character of the format string must not be '*' '?' '@' or
+'r'; in essence, a new #GVariant must always be constructed by this
+function (and not merely passed through it unmodified).
+
+Since: 2.24
+
+</description>
+<parameters>
+<parameter name="format_string">
+<parameter_description> a #GVariant format string
+</parameter_description>
+</parameter>
+<parameter name="Varargs">
+<parameter_description> arguments, as per @format_string
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new floating #GVariant instance
+</return>
+</function>
+
<function name="g_datalist_foreach">
<description>
Calls the given function for each data element of the datalist. The
@@ -34719,35 +35093,6 @@ a subparser is pushed.
<return></return>
</function>
-<function name="g_private_new">
-<description>
-Creates a new #GPrivate. If @destructor is non-%NULL, it is a
-pointer to a destructor function. Whenever a thread ends and the
-corresponding pointer keyed to this instance of #GPrivate is
-non-%NULL, the destructor is called with this pointer as the
-argument.
-
-<note><para>@destructor is used quite differently from @notify in
-g_static_private_set().</para></note>
-
-<note><para>A #GPrivate can not be freed. Reuse it instead, if you
-can, to avoid shortage, or use #GStaticPrivate.</para></note>
-
-<note><para>This function will abort if g_thread_init() has not been
-called yet.</para></note>
-
-</description>
-<parameters>
-<parameter name="destructor">
-<parameter_description> a function to destroy the data keyed to #GPrivate when
-a thread ends.
-</parameter_description>
-</parameter>
-</parameters>
-<return> a new #GPrivate.
-</return>
-</function>
-
<function name="g_direct_equal">
<description>
Compares two #gpointer arguments and returns %TRUE if they are equal.
@@ -34880,40 +35225,33 @@ It is usually used after g_slist_remove_link().
<return></return>
</function>
-<function name="g_cclosure_marshal_VOID__UCHAR">
+<function name="g_private_new">
<description>
-A marshaller for a #GCClosure with a callback of type
-<literal>void (*callback) (gpointer instance, guchar arg1, gpointer user_data)</literal>.
+Creates a new #GPrivate. If @destructor is non-%NULL, it is a
+pointer to a destructor function. Whenever a thread ends and the
+corresponding pointer keyed to this instance of #GPrivate is
+non-%NULL, the destructor is called with this pointer as the
+argument.
+
+<note><para>@destructor is used quite differently from @notify in
+g_static_private_set().</para></note>
+
+<note><para>A #GPrivate can not be freed. Reuse it instead, if you
+can, to avoid shortage, or use #GStaticPrivate.</para></note>
+
+<note><para>This function will abort if g_thread_init() has not been
+called yet.</para></note>
</description>
<parameters>
-<parameter name="closure">
-<parameter_description> the #GClosure to which the marshaller belongs
-</parameter_description>
-</parameter>
-<parameter name="return_value">
-<parameter_description> ignored
-</parameter_description>
-</parameter>
-<parameter name="n_param_values">
-<parameter_description> 2
-</parameter_description>
-</parameter>
-<parameter name="param_values">
-<parameter_description> a #GValue array holding the instance and the #guchar parameter
-</parameter_description>
-</parameter>
-<parameter name="invocation_hint">
-<parameter_description> the invocation hint given as the last argument
-to g_closure_invoke()
-</parameter_description>
-</parameter>
-<parameter name="marshal_data">
-<parameter_description> additional data specified when registering the marshaller
+<parameter name="destructor">
+<parameter_description> a function to destroy the data keyed to #GPrivate when
+a thread ends.
</parameter_description>
</parameter>
</parameters>
-<return></return>
+<return> a new #GPrivate.
+</return>
</function>
<function name="g_array_prepend_vals">
@@ -35535,6 +35873,33 @@ URI cannot be found.
</return>
</function>
+<function name="g_variant_new_byte_array">
+<description>
+Constructs an array of bytes #GVariant from the given array of bytes.
+
+If @length is -1 then @array is taken to be a normal C string (in the
+sense that it is terminated by a nul character). The nul character
+is included in the array. If length is not -1 then it gives the
+length of @array which may then contain nul chracters with no special
+meaning.
+
+Since: 2.26
+
+</description>
+<parameters>
+<parameter name="array">
+<parameter_description> a pointer to an array of bytes
+</parameter_description>
+</parameter>
+<parameter name="length">
+<parameter_description> the length of @array, or -1
+</parameter_description>
+</parameter>
+</parameters>
+<return> a new floating #GVariant instance
+</return>
+</function>
+
<function name="g_strrstr_len">
<description>
Searches the string @haystack for the last occurrence
@@ -35630,12 +35995,14 @@ Flushes the write buffer for the GIOChannel.
<description>
Creates a string #GVariant with the contents of @string.
+ string must be valid utf8.
+
Since: 2.24
</description>
<parameters>
<parameter name="string">
-<parameter_description> a normal C nul-terminated string
+<parameter_description> a normal utf8 nul-terminated string
</parameter_description>
</parameter>
</parameters>
@@ -36668,47 +37035,6 @@ Get the contents of a %G_TYPE_OBJECT derived #GValue.
</return>
</function>
-<function name="g_io_add_watch_full">
-<description>
-Adds the #GIOChannel into the default main loop context
-with the given priority.
-
-This internally creates a main loop source using g_io_create_watch()
-and attaches it to the main loop context with g_source_attach().
-You can do these steps manuallt if you need greater control.
-
-
-</description>
-<parameters>
-<parameter name="channel">
-<parameter_description> a #GIOChannel
-</parameter_description>
-</parameter>
-<parameter name="priority">
-<parameter_description> the priority of the #GIOChannel source
-</parameter_description>
-</parameter>
-<parameter name="condition">
-<parameter_description> the condition to watch for
-</parameter_description>
-</parameter>
-<parameter name="func">
-<parameter_description> the function to call when the condition is satisfied
-</parameter_description>
-</parameter>
-<parameter name="user_data">
-<parameter_description> user data to pass to @func
-</parameter_description>
-</parameter>
-<parameter name="notify">
-<parameter_description> the function to call when the source is removed
-</parameter_description>
-</parameter>
-</parameters>
-<return> the event source id
-</return>
-</function>
-
<function name="g_sequence_iter_is_end">
<description>
Returns whether @iter is the end iterator
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index 8287b31..723f530 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -18,16 +18,6 @@
)
)
-(define-flags ArrayFlags
- (in-module "GBSearch")
- (c-name "GBSearchArrayFlags")
- (gtype-id "G_TYPE_B_SEARCH_ARRAY_FLAGS")
- (values
- '("lign-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2")
- '("uto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK")
- )
-)
-
(define-enum Type
(in-module "GChecksum")
(c-name "GChecksumType")
@@ -101,16 +91,6 @@
)
)
-(define-flags Flag
- (in-module "GDebug")
- (c-name "GDebugFlag")
- (gtype-id "G_TYPE_DEBUG_FLAG")
- (values
- '("warnings" "G_DEBUG_FATAL_WARNINGS")
- '("criticals" "G_DEBUG_FATAL_CRITICALS")
- )
-)
-
(define-enum Error
(in-module "GFile")
(c-name "GFileError")
@@ -883,10 +863,6 @@
)
-;; From galias.h
-
-
-
;; From galloca.h
(define-function alloca
@@ -2066,30 +2042,6 @@
-;; From gbsearcharray.h
-
-(define-function if
- (c-name "if")
- (return-type "else")
- (parameters
- '("cmp-<" "0")
- )
-)
-
-(define-function MIN
- (c-name "MIN")
- (return-type "return")
- (parameters
- '("barray->n_nodes-+" "1")
- )
-)
-
-
-
-;; From gbuffer.h
-
-
-
;; From gcache.h
(define-function g_cache_new
@@ -2377,7 +2329,7 @@
'("gssize" "len")
'("const-gchar*" "to_codeset")
'("const-gchar*" "from_codeset")
- '("gchar*" "fallback")
+ '("const-gchar*" "fallback")
'("gsize*" "bytes_read")
'("gsize*" "bytes_written")
'("GError**" "error")
@@ -2618,10 +2570,6 @@
-;; From gdatasetprivate.h
-
-
-
;; From gdate.h
(define-function g_date_new
@@ -3014,10 +2962,6 @@
-;; From gdebug.h
-
-
-
;; From gdir.h
(define-function g_dir_open
@@ -4516,6 +4460,50 @@
)
)
+(define-method get_int64
+ (of-object "GKeyFile")
+ (c-name "g_key_file_get_int64")
+ (return-type "gint64")
+ (parameters
+ '("const-gchar*" "group_name")
+ '("const-gchar*" "key")
+ '("GError**" "error")
+ )
+)
+
+(define-method set_int64
+ (of-object "GKeyFile")
+ (c-name "g_key_file_set_int64")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "group_name")
+ '("const-gchar*" "key")
+ '("gint64" "value")
+ )
+)
+
+(define-method get_uint64
+ (of-object "GKeyFile")
+ (c-name "g_key_file_get_uint64")
+ (return-type "guint64")
+ (parameters
+ '("const-gchar*" "group_name")
+ '("const-gchar*" "key")
+ '("GError**" "error")
+ )
+)
+
+(define-method set_uint64
+ (of-object "GKeyFile")
+ (c-name "g_key_file_set_uint64")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "group_name")
+ '("const-gchar*" "key")
+ '("guint64" "value")
+ )
+)
+
(define-method get_double
(of-object "GKeyFile")
(c-name "g_key_file_get_double")
@@ -4717,26 +4705,6 @@
-;; From glib.h
-
-
-
-;; From glibintl.h
-
-(define-function glib_gettext
- (c-name "glib_gettext")
- (return-type "const-gchar*")
- (parameters
- '("const-gchar*" "str")
- )
-)
-
-
-
-;; From glib-object.h
-
-
-
;; From glist.h
(define-function g_list_alloc
@@ -5354,6 +5322,30 @@
(return-type "gboolean")
)
+(define-method set_name
+ (of-object "GSource")
+ (c-name "g_source_set_name")
+ (return-type "none")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+(define-method get_name
+ (of-object "GSource")
+ (c-name "g_source_get_name")
+ (return-type "const-char*")
+)
+
+(define-function g_source_set_name_by_id
+ (c-name "g_source_set_name_by_id")
+ (return-type "none")
+ (parameters
+ '("guint" "tag")
+ '("const-char*" "name")
+ )
+)
+
(define-method set_callback_indirect
(of-object "GSource")
(c-name "g_source_set_callback_indirect")
@@ -6099,10 +6091,6 @@
-;; From gmirroringtable.h
-
-
-
;; From gnode.h
(define-function g_node_new
@@ -6715,10 +6703,6 @@
-;; From gprintfint.h
-
-
-
;; From gqsort.h
(define-function g_qsort_with_data
@@ -7294,6 +7278,18 @@
)
)
+(define-method get_compile_flags
+ (of-object "GRegex")
+ (c-name "g_regex_get_compile_flags")
+ (return-type "GRegexCompileFlags")
+)
+
+(define-method get_match_flags
+ (of-object "GRegex")
+ (c-name "g_regex_get_match_flags")
+ (return-type "GRegexMatchFlags")
+)
+
(define-function g_regex_match_simple
(c-name "g_regex_match_simple")
(return-type "gboolean")
@@ -7826,10 +7822,6 @@
-;; From gscripttable.h
-
-
-
;; From gsequence.h
(define-function g_sequence_new
@@ -8682,7 +8674,7 @@
(return-type "int")
(parameters
'("const-gchar*" "filename")
- '("struct-_g_stat_struct*" "buf")
+ '("GStatBuf*" "buf")
)
)
@@ -8691,25 +8683,7 @@
(return-type "int")
(parameters
'("const-gchar*" "filename")
- '("struct-_g_stat_struct*" "buf")
- )
-)
-
-(define-function g_stat
- (c-name "g_stat")
- (return-type "int")
- (parameters
- '("const-gchar*" "filename")
- '("struct-stat*" "buf")
- )
-)
-
-(define-function g_lstat
- (c-name "g_lstat")
- (return-type "int")
- (parameters
- '("const-gchar*" "filename")
- '("struct-stat*" "buf")
+ '("GStatBuf*" "buf")
)
)
@@ -9227,6 +9201,16 @@
)
)
+(define-function g_dcgettext
+ (c-name "g_dcgettext")
+ (return-type "const-gchar*")
+ (parameters
+ '("const-gchar*" "domain")
+ '("const-gchar*" "msgid")
+ '("int" "category")
+ )
+)
+
(define-function g_dngettext
(c-name "g_dngettext")
(return-type "const-gchar*")
@@ -9648,7 +9632,7 @@
(return-type "none")
(parameters
'("const-char*" "testpath")
- '("somefunc" "test_func")
+ '("void-(*" "test_func")
)
)
@@ -9658,7 +9642,7 @@
(parameters
'("const-char*" "testpath")
'("gconstpointer" "test_data")
- '("somefunc" "test_func")
+ '("void-(*" "test_func")
)
)
@@ -9773,7 +9757,7 @@
'("const-char*" "test_name")
'("gsize" "data_size")
'("gconstpointer" "test_data")
- '("somefunc" "data_setup")
+ '("void-(*" "data_setup")
)
)
@@ -9906,7 +9890,7 @@
'("const-char*" "testpath")
'("gsize" "data_size")
'("gconstpointer" "test_data")
- '("somefunc" "data_setup")
+ '("void-(*" "data_setup")
)
)
@@ -10324,15 +10308,6 @@
-;; From gthreadprivate.h
-
-(define-function g_thread_init_glib
- (c-name "g_thread_init_glib")
- (return-type "none")
-)
-
-
-
;; From gtimer.h
(define-function g_timer_new
@@ -10570,14 +10545,6 @@
-;; From gunibreak.h
-
-
-
-;; From gunichartables.h
-
-
-
;; From gunicode.h
(define-function g_get_charset
@@ -11053,18 +11020,6 @@
-;; From gunicodeprivate.h
-
-
-
-;; From gunicomp.h
-
-
-
-;; From gunidecomp.h
-
-
-
;; From gurifuncs.h
(define-function g_uri_unescape_string
@@ -11303,6 +11258,22 @@
(return-type "gchar**")
)
+(define-function g_atexit
+ (c-name "g_atexit")
+ (return-type "none")
+ (parameters
+ '("GVoidFunc" "func")
+ )
+)
+
+(define-function atexit
+ (c-name "atexit")
+ (return-type "int")
+ (parameters
+ '("void" "(*")
+ )
+)
+
(define-function g_find_program_in_path
(c-name "g_find_program_in_path")
(return-type "gchar*")
@@ -11323,10 +11294,6 @@
-;; From gvariant-core.h
-
-
-
;; From gvariant.h
(define-method unref
@@ -11506,6 +11473,15 @@
(return-type "GVariant*")
)
+(define-function g_variant_new_byte_array
+ (c-name "g_variant_new_byte_array")
+ (return-type "GVariant*")
+ (parameters
+ '("gconstpointer" "array")
+ '("gssize" "length")
+ )
+)
+
(define-function g_variant_new_strv
(c-name "g_variant_new_strv")
(return-type "GVariant*")
@@ -11599,6 +11575,15 @@
)
)
+(define-method get_byte_array
+ (of-object "GVariant")
+ (c-name "g_variant_get_byte_array")
+ (return-type "gconstpointer")
+ (parameters
+ '("gsize*" "length")
+ )
+)
+
(define-method get_strv
(of-object "GVariant")
(c-name "g_variant_get_strv")
@@ -11753,6 +11738,37 @@
)
)
+(define-method get_normal_form
+ (of-object "GVariant")
+ (c-name "g_variant_get_normal_form")
+ (return-type "GVariant*")
+)
+
+(define-method is_normal_form
+ (of-object "GVariant")
+ (c-name "g_variant_is_normal_form")
+ (return-type "gboolean")
+)
+
+(define-method byteswap
+ (of-object "GVariant")
+ (c-name "g_variant_byteswap")
+ (return-type "GVariant*")
+)
+
+(define-function g_variant_new_from_data
+ (c-name "g_variant_new_from_data")
+ (return-type "GVariant*")
+ (parameters
+ '("const-GVariantType*" "type")
+ '("gconstpointer" "data")
+ '("gsize" "size")
+ '("gboolean" "trusted")
+ '("GDestroyNotify" "notify")
+ '("gpointer" "user_data")
+ )
+)
+
(define-method iter_new
(of-object "GVariant")
(c-name "g_variant_iter_new")
@@ -11812,6 +11828,11 @@
(varargs #t)
)
+(define-function g_variant_parser_get_error_quark
+ (c-name "g_variant_parser_get_error_quark")
+ (return-type "GQuark")
+)
+
(define-function g_variant_builder_new
(c-name "g_variant_builder_new")
(is-constructor-of "GVariantBuilder")
@@ -11929,107 +11950,42 @@
)
)
-
-
-;; From gvariant-internal.h
-
-(define-function g_variant_format_string_scan
- (c-name "g_variant_format_string_scan")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "string")
- '("const-gchar*" "limit")
- '("const-gchar**" "endptr")
- )
-)
-
-(define-function g_variant_format_string_scan_type
- (c-name "g_variant_format_string_scan_type")
- (return-type "GVariantType*")
+(define-function g_variant_parse
+ (c-name "g_variant_parse")
+ (return-type "GVariant*")
(parameters
- '("const-gchar*" "string")
+ '("const-GVariantType*" "type")
+ '("const-gchar*" "text")
'("const-gchar*" "limit")
'("const-gchar**" "endptr")
+ '("GError**" "error")
)
)
-
-
-;; From gvariant-serialiser.h
-
-(define-method n_children
- (of-object "GVariantSerialised")
- (c-name "g_variant_serialised_n_children")
- (return-type "gsize")
-)
-
-(define-method get_child
- (of-object "GVariantSerialised")
- (c-name "g_variant_serialised_get_child")
- (return-type "GVariantSerialised")
- (parameters
- '("gsize" "index")
- )
-)
-
-(define-function g_variant_serialiser_needed_size
- (c-name "g_variant_serialiser_needed_size")
- (return-type "gsize")
- (parameters
- '("GVariantTypeInfo*" "info")
- '("GVariantSerialisedFiller" "gsv_filler")
- '("const-gpointer*" "children")
- '("gsize" "n_children")
- )
-)
-
-(define-function g_variant_serialiser_serialise
- (c-name "g_variant_serialiser_serialise")
- (return-type "none")
- (parameters
- '("GVariantSerialised" "container")
- '("GVariantSerialisedFiller" "gsv_filler")
- '("const-gpointer*" "children")
- '("gsize" "n_children")
- )
-)
-
-(define-method is_normal
- (of-object "GVariantSerialised")
- (c-name "g_variant_serialised_is_normal")
- (return-type "gboolean")
-)
-
-(define-method byteswap
- (of-object "GVariantSerialised")
- (c-name "g_variant_serialised_byteswap")
- (return-type "none")
-)
-
-(define-function g_variant_serialiser_is_string
- (c-name "g_variant_serialiser_is_string")
- (return-type "gboolean")
+(define-function g_variant_new_parsed
+ (c-name "g_variant_new_parsed")
+ (return-type "GVariant*")
(parameters
- '("gconstpointer" "data")
- '("gsize" "size")
+ '("const-gchar*" "format")
)
+ (varargs #t)
)
-(define-function g_variant_serialiser_is_object_path
- (c-name "g_variant_serialiser_is_object_path")
- (return-type "gboolean")
+(define-function g_variant_new_parsed_va
+ (c-name "g_variant_new_parsed_va")
+ (return-type "GVariant*")
(parameters
- '("gconstpointer" "data")
- '("gsize" "size")
+ '("const-gchar*" "format")
+ '("va_list*" "app")
)
)
-(define-function g_variant_serialiser_is_signature
- (c-name "g_variant_serialiser_is_signature")
- (return-type "gboolean")
+(define-function g_variant_compare
+ (c-name "g_variant_compare")
+ (return-type "gint")
(parameters
- '("gconstpointer" "data")
- '("gsize" "size")
+ '("gconstpointer" "one")
+ '("gconstpointer" "two")
)
)
@@ -12244,80 +12200,6 @@
-;; From gvarianttypeinfo.h
-
-(define-method get_type_string
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_get_type_string")
- (return-type "const-gchar*")
-)
-
-(define-method query
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_query")
- (return-type "none")
- (parameters
- '("guint*" "alignment")
- '("gsize*" "size")
- )
-)
-
-(define-method element
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_element")
- (return-type "GVariantTypeInfo*")
-)
-
-(define-method query_element
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_query_element")
- (return-type "none")
- (parameters
- '("guint*" "alignment")
- '("gsize*" "size")
- )
-)
-
-(define-method n_members
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_n_members")
- (return-type "gsize")
-)
-
-(define-method member_info
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_member_info")
- (return-type "const-GVariantMemberInfo*")
- (parameters
- '("gsize" "index")
- )
-)
-
-(define-method info_get
- (of-object "GVariantType")
- (c-name "g_variant_type_info_get")
- (return-type "GVariantTypeInfo*")
-)
-
-(define-method ref
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_ref")
- (return-type "GVariantTypeInfo*")
-)
-
-(define-method unref
- (of-object "GVariantTypeInfo")
- (c-name "g_variant_type_info_unref")
- (return-type "none")
-)
-
-(define-function g_variant_type_info_assert_no_infos
- (c-name "g_variant_type_info_assert_no_infos")
- (return-type "none")
-)
-
-
-
;; From gwin32.h
(define-function g_win32_ftruncate
diff --git a/glib/src/keyfile.ccg b/glib/src/keyfile.ccg
index 4db5390..27c6d3e 100644
--- a/glib/src/keyfile.ccg
+++ b/glib/src/keyfile.ccg
@@ -124,6 +124,18 @@ Glib::ustring KeyFile::get_locale_string(const Glib::ustring& group_name,
return Glib::convert_return_gchar_ptr_to_ustring(str);
}
+bool KeyFile::get_boolean(const Glib::ustring& key) const
+{
+ GError* gerror = 0;
+ const bool value =
+ static_cast<bool>(g_key_file_get_boolean(const_cast<GKeyFile*>(gobj()),
+ 0, key.c_str(), &gerror));
+ if(gerror)
+ Glib::Error::throw_exception(gerror);
+
+ return value;
+}
+
int KeyFile::get_integer(const Glib::ustring& key) const
{
GError* gerror = 0;
@@ -135,6 +147,32 @@ int KeyFile::get_integer(const Glib::ustring& key) const
return value;
}
+gint64 KeyFile::get_int64(const Glib::ustring& key) const
+{
+ GError* gerror = 0;
+
+ const gint64 value = g_key_file_get_int64(const_cast<GKeyFile*>(gobj()), 0,
+ key.c_str(), &gerror);
+
+ if(gerror)
+ Glib::Error::throw_exception(gerror);
+
+ return value;
+}
+
+guint64 KeyFile::get_uint64(const Glib::ustring& key) const
+{
+ GError* gerror = 0;
+
+ const guint64 value = g_key_file_get_uint64(const_cast<GKeyFile*>(gobj()),
+ 0, key.c_str(), &gerror);
+
+ if(gerror)
+ Glib::Error::throw_exception(gerror);
+
+ return value;
+}
+
double KeyFile::get_double(const Glib::ustring& key) const
{
GError* gerror = 0;
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index 97164fc..ae797b2 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -97,6 +97,9 @@ class KeyFile
_CLASS_GENERIC(KeyFile, GKeyFile)
public:
+ //TODO: Maybe replace all the get_*/set_* methods with some generic get/set
+ //methods when it is possible.
+
/** Creates a new, empty KeyFile object.
*/
KeyFile();
@@ -184,6 +187,16 @@ public:
_IGNORE(g_key_file_get_locale_string)
_WRAP_METHOD(Glib::ustring get_locale_string(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ustring& locale) const, g_key_file_get_locale_string, errthrow)
+
+ /** Gets the value in the first group, under @a key, interpreting it as
+ * a boolean.
+ * @param key The name of the key.
+ * @return The value of @a key as a boolean.
+ * @throw Glib::KeyFileError.
+ * @newin{2,6}
+ */
+ bool get_boolean(const Glib::ustring& key) const;
+
_WRAP_METHOD(bool get_boolean(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_boolean, errthrow)
/** Gets the value in the first group, under @a key, interpreting it as
@@ -191,11 +204,39 @@ public:
* @param key The name of the key
* @return The value of @a key as an integer
* @throw Glib::KeyFileError
+ * @newin{2,6}
*/
int get_integer(const Glib::ustring& key) const;
+
_WRAP_METHOD(int get_integer(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_integer, errthrow)
/** Gets the value in the first group, under @a key, interpreting it as
+ * a signed 64-bit integer. This is similar to get_integer() but can return
+ * 64-bit results without truncation.
+ * @param key The name of the key.
+ * @return The value of @a key as a signed 64-bit integer, or <tt>0</tt> if
+ * the key was not found or could not be parsed.
+ * @throw Glib::KeyFileError.
+ * @newin{2,26}
+ */
+ gint64 get_int64(const Glib::ustring& key) const;
+
+ _WRAP_METHOD(gint64 get_int64(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_int64, errthrow)
+
+ /** Gets the value in the first group, under @a key, interpreting it as
+ * an unsigned 64-bit integer. This is similar to get_integer() but can
+ * return large positive results without truncation.
+ * @param key The name of the key.
+ * @return The value of @a key as an unsigned 64-bit integer, or <tt>0</tt>
+ * if the key was not found or could not be parsed.
+ * @throw Glib::KeyFileError.
+ * @newin{2,26}
+ */
+ guint64 get_uint64(const Glib::ustring& key) const;
+
+ _WRAP_METHOD(guint64 get_uint64(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_uint64, errthrow)
+
+ /** Gets the value in the first group, under @a key, interpreting it as
* a double.
* @param key The name of the key
* @return The value of @a key as an double
@@ -204,6 +245,7 @@ public:
* @newin{2,14}
*/
double get_double(const Glib::ustring& key) const;
+
_WRAP_METHOD(double get_double(const Glib::ustring& group_name, const Glib::ustring& key) const, g_key_file_get_double, errthrow)
_WRAP_METHOD(void set_double(const Glib::ustring& group_name, const Glib::ustring& key, double value), g_key_file_set_double)
@@ -294,6 +336,8 @@ public:
_WRAP_METHOD(void set_locale_string(const Glib::ustring& group_name, const Glib::ustring& key, const Glib::ustring& locale, const Glib::ustring& string), g_key_file_set_locale_string)
_WRAP_METHOD(void set_boolean(const Glib::ustring& group_name, const Glib::ustring& key, bool value), g_key_file_set_boolean)
_WRAP_METHOD(void set_integer(const Glib::ustring& group_name, const Glib::ustring& key, int value), g_key_file_set_integer)
+ _WRAP_METHOD(void set_int64(const Glib::ustring& group_name, const Glib::ustring& key, gint64 value), g_key_file_set_int64)
+ _WRAP_METHOD(void set_uint64(const Glib::ustring& group_name, const Glib::ustring& key, guint64 value), g_key_file_set_uint64)
/** Sets a list of string values for @a key under @a group_name. If
* key cannot be found it is created. If @a group_name cannot be found
diff --git a/glib/src/regex.hg b/glib/src/regex.hg
index 7d90bac..15ba60e 100644
--- a/glib/src/regex.hg
+++ b/glib/src/regex.hg
@@ -103,6 +103,8 @@ public:
_WRAP_METHOD(int get_max_backref() const, g_regex_get_max_backref)
_WRAP_METHOD(int get_capture_count() const, g_regex_get_capture_count)
_WRAP_METHOD(int get_string_number(const Glib::ustring& name) const, g_regex_get_string_number)
+ _WRAP_METHOD(RegexCompileFlags get_compile_flags() const, g_regex_get_compile_flags)
+ _WRAP_METHOD(RegexMatchFlags get_match_flags() const, g_regex_get_match_flags)
static Glib::ustring escape_string(const Glib::ustring& string);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
