[glibmm] Regenerate .defs files.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Regenerate .defs files.
- Date: Fri, 30 Mar 2012 07:39:50 +0000 (UTC)
commit 4bfc313d475b63650ef2ac68d6010edef3b94465
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Mar 30 09:24:32 2012 +0200
Regenerate .defs files.
* gio/src/gio_docs.xml:
* gio/src/gio_enums.defs:
* gio/src/gio_signals.defs:
* glib/src/glib_docs.xml:
* glib/src/glib_enums.defs:
* glib/src/glib_functions.defs:
* glib/src/gobject_functions.defs: Regenereated using
the scripts.
ChangeLog | 13 ++++++
gio/src/gio_docs.xml | 56 ++++++++++++++++++++++++++++
gio/src/gio_enums.defs | 2 +-
gio/src/gio_signals.defs | 17 ++++++++
glib/src/glib_docs.xml | 78 +++++++++++++++++++++++++++++++--------
glib/src/glib_enums.defs | 6 ++-
glib/src/glib_functions.defs | 1 +
glib/src/gobject_functions.defs | 34 ++++++++++++++--
8 files changed, 184 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c8cea8a..5ccd957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-03-30 Murray Cumming <murrayc murrayc com>
+
+ Regenerate .defs files.
+
+ * gio/src/gio_docs.xml:
+ * gio/src/gio_enums.defs:
+ * gio/src/gio_signals.defs:
+ * glib/src/glib_docs.xml:
+ * glib/src/glib_enums.defs:
+ * glib/src/glib_functions.defs:
+ * glib/src/gobject_functions.defs: Regenereated using
+ the scripts.
+
2.31.22:
2012-03-26 Kjell Ahlstedt <kjell ahlstedt bredband net>
diff --git a/gio/src/gio_docs.xml b/gio/src/gio_docs.xml
index e8ea804..494b5c7 100644
--- a/gio/src/gio_docs.xml
+++ b/gio/src/gio_docs.xml
@@ -22568,6 +22568,9 @@ g_dbus_connection_call_finish() to get the result of the operation.
See g_dbus_connection_call_sync() for the synchronous version of this
function.
+If @callback is %NULL then the D-Bus method call message will be sent with
+the %G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED flag set.
+
Since: 2.26
</description>
@@ -28012,6 +28015,9 @@ You can then call g_dbus_proxy_call_finish() to get the result of
the operation. See g_dbus_proxy_call_sync() for the synchronous
version of this method.
+If @callback is %NULL then the D-Bus method call message will be sent with
+the %G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED flag set.
+
Since: 2.26
</description>
@@ -47256,6 +47262,15 @@ Since: 2.20
<description>
Creates a #GSimpleAsyncResult.
+The common convention is to create the #GSimpleAsyncResult in the
+function that starts the asynchronous operation and use that same
+function as the @source_tag.
+
+If your operation supports cancellation with #GCancellable (which it
+probably should) then you should provide the user's cancellable to
+g_simple_async_result_set_check_cancellable() immediately after
+this function returns.
+
</description>
<parameters>
@@ -47384,6 +47399,10 @@ Since: 2.28
Propagates an error from within the simple asynchronous result to
a given destination.
+If the #GCancellable given to a prior call to
+g_simple_async_result_set_check_cancellable() is cancelled then this
+function will return %TRUE with @dest set appropriately.
+
</description>
<parameters>
@@ -47431,6 +47450,40 @@ is needed to run the job and report its completion.
<return></return>
</function>
+<function name="g_simple_async_result_set_check_cancellable">
+<description>
+Sets a #GCancellable to check before dispatching results.
+
+This function has one very specific purpose: the provided cancellable
+is checked at the time of g_simple_async_result_propagate_error() If
+it is cancelled, these functions will return an "Operation was
+cancelled" error (%G_IO_ERROR_CANCELLED).
+
+Implementors of cancellable asynchronous functions should use this in
+order to provide a guarantee to their callers that cancelling an
+async operation will reliably result in an error being returned for
+that operation (even if a positive result for the operation has
+already been sent as an idle to the main context to be dispatched).
+
+The checking described above is done regardless of any call to the
+unrelated g_simple_async_result_set_handle_cancellation() function.
+
+Since: 2.32
+
+</description>
+<parameters>
+<parameter name="simple">
+<parameter_description> a #GSimpleAsyncResult
+</parameter_description>
+</parameter>
+<parameter name="check_cancellable">
+<parameter_description> a #GCancellable to check, or %NULL to unset
+</parameter_description>
+</parameter>
+</parameters>
+<return></return>
+</function>
+
<function name="g_simple_async_result_set_error">
<description>
Sets an error within the asynchronous result without a #GError.
@@ -47514,6 +47567,9 @@ Sets the result from a #GError.
<description>
Sets whether to handle cancellation within the asynchronous operation.
+This function has nothing to do with
+g_simple_async_result_set_check_cancellable(). It only refers to the
+#GCancellable passed to g_simple_async_result_run_in_thread().
</description>
<parameters>
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index f6e18ec..ea27a83 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -696,7 +696,7 @@
)
;; Original typedef:
-;; typedef enum
+;; typedef enum /*< flags >*/
;; {
;; G_SOCKET_MSG_NONE,
;; G_SOCKET_MSG_OOB = GLIB_SYSDEF_MSG_OOB,
diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index d9a1d5c..784f9e5 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -539,6 +539,21 @@
(construct-only #t)
)
+;; From GMenu
+
+;; From GMenuModel
+
+(define-signal items-changed
+ (of-object "GMenuModel")
+ (return-type "void")
+ (when "last")
+ (parameters
+ '("gint" "p0")
+ '("gint" "p1")
+ '("gint" "p2")
+ )
+)
+
;; From GMount
(define-signal changed
@@ -1794,6 +1809,8 @@
;; From GDBusArgInfo
+;; From GDBusMenuModel
+
;; From GDBusMethodInfo
;; From GDBusSignalInfo
diff --git a/glib/src/glib_docs.xml b/glib/src/glib_docs.xml
index fe2971e..2f1bacc 100644
--- a/glib/src/glib_docs.xml
+++ b/glib/src/glib_docs.xml
@@ -505,11 +505,7 @@ comparison function (returns less than zero for first arg is less
than second arg, zero for equal, greater zero if first arg is
greater than second arg).
-If two array elements compare equal, their order in the sorted array
-is undefined. If you want equal elements to keep their order (i.e.
-you want a stable sort) you can write a comparison function that,
-if two elements would otherwise compare equal, compares them by
-their addresses.
+This is guaranteed to be a stable sort since version 2.32.
</description>
<parameters>
@@ -530,6 +526,12 @@ their addresses.
Like g_array_sort(), but the comparison function receives an extra
user data argument.
+This is guaranteed to be a stable sort since version 2.32.
+
+There used to be a comment here about making the sort stable by
+using the addresses of the elements in the comparison function.
+This did not actually work, so any such code should be removed.
+
</description>
<parameters>
<parameter name="array">
@@ -27179,16 +27181,12 @@ comparison function (returns less than zero for first arg is less
than second arg, zero for equal, greater than zero if irst arg is
greater than second arg).
-If two array elements compare equal, their order in the sorted array
-is undefined. If you want equal elements to keep their order (i.e.
-you want a stable sort) you can write a comparison function that,
-if two elements would otherwise compare equal, compares them by
-their addresses.
-
<note><para>The comparison function for g_ptr_array_sort() doesn't
take the pointers from the array as arguments, it takes pointers to
the pointers in the array.</para></note>
+This is guaranteed to be a stable sort since version 2.32.
+
</description>
<parameters>
<parameter name="array">
@@ -27212,6 +27210,8 @@ user data argument.
doesn't take the pointers from the array as arguments, it takes
pointers to the pointers in the array.</para></note>
+This is guaranteed to be a stable sort since version 2.32.
+
</description>
<parameters>
<parameter name="array">
@@ -27254,6 +27254,8 @@ Since: 2.22
This is just like the standard C qsort() function, but
the comparison routine accepts a user data argument.
+This is guaranteed to be a stable sort since version 2.32.
+
</description>
<parameters>
<parameter name="pbase">
@@ -31200,6 +31202,14 @@ It should return 0 if the items are equal, a negative value if
the first item comes before the second, and a positive value if
the second item comes before the first.
+<note><para>
+This function will fail if the data contained in the sequence is
+unsorted. Use g_sequence_insert_sorted() or
+g_sequence_insert_sorted_iter() to add data to your sequence or, if
+you want to add a large amount of data, call g_sequence_sort() after
+doing unsorted insertions.
+</para></note>
+
Since: 2.28
</description>
@@ -31237,6 +31247,14 @@ It should return 0 if the iterators are equal, a negative value
if the first iterator comes before the second, and a positive
value if the second iterator comes before the first.
+<note><para>
+This function will fail if the data contained in the sequence is
+unsorted. Use g_sequence_insert_sorted() or
+g_sequence_insert_sorted_iter() to add data to your sequence or, if
+you want to add a large amount of data, call g_sequence_sort() after
+doing unsorted insertions.
+</para></note>
+
Since: 2.28
</description>
@@ -31446,6 +31464,14 @@ the second item comes before the first.
If you are simply searching for an existing element of the sequence,
consider using g_sequence_lookup().
+<note><para>
+This function will fail if the data contained in the sequence is
+unsorted. Use g_sequence_insert_sorted() or
+g_sequence_insert_sorted_iter() to add data to your sequence or, if
+you want to add a large amount of data, call g_sequence_sort() after
+doing unsorted insertions.
+</para></note>
+
Since: 2.14
</description>
@@ -31486,6 +31512,14 @@ value if the second iterator comes before the first.
If you are simply searching for an existing element of the sequence,
consider using g_sequence_lookup_iter().
+<note><para>
+This function will fail if the data contained in the sequence is
+unsorted. Use g_sequence_insert_sorted() or
+g_sequence_insert_sorted_iter() to add data to your sequence or, if
+you want to add a large amount of data, call g_sequence_sort() after
+doing unsorted insertions.
+</para></note>
+
Since: 2.14
</description>
@@ -41519,6 +41553,8 @@ The following example shows attaching a private structure
<structname>MyObject</structname> defined in the standard GObject
fashion.
type's class_init() function.
+Note the use of a structure member "priv" to avoid the overhead
+of repeatedly calling MY_OBJECT_GET_PRIVATE().
|[
typedef struct _MyObject MyObject;
@@ -41551,7 +41587,11 @@ MyObjectPrivate);
static int
my_object_get_some_field (MyObject *my_object)
{
-MyObjectPrivate *priv = my_object->priv;
+MyObjectPrivate *priv;
+
+g_return_val_if_fail (MY_IS_OBJECT (my_object), 0);
+
+priv = my_object->priv;
return priv->some_field;
}
@@ -41936,6 +41976,8 @@ to initialize the type system and assorted other code portions
(such as the various fundamental type implementations or the signal
system).
+This function is idempotent.
+
Since version 2.24 this also initializes the thread system
</description>
@@ -41948,6 +41990,8 @@ Since version 2.24 this also initializes the thread system
<description>
Similar to g_type_init(), but additionally sets debug flags.
+This function is idempotent.
+
</description>
<parameters>
<parameter name="debug_flags">
@@ -43956,20 +44000,22 @@ Since: 2.16
</description>
<parameters>
<parameter name="escaped_string">
-<parameter_description> a string.
+<parameter_description> A string, may be %NULL
</parameter_description>
</parameter>
<parameter name="escaped_string_end">
-<parameter_description> a string.
+<parameter_description> Pointer to end of @escaped_string, may be %NULL
</parameter_description>
</parameter>
<parameter name="illegal_characters">
-<parameter_description> an optional string of illegal characters not to be allowed.
+<parameter_description> An optional string of illegal characters not to be allowed, may be %NULL
</parameter_description>
</parameter>
</parameters>
<return> an unescaped version of @escaped_string or %NULL on error.
-The returned string should be freed when no longer needed.
+The returned string should be freed when no longer needed. As a
+special case if %NULL is given for @escaped_string, this function
+will return %NULL.
</return>
</function>
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index c62901f..f7fca47 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -1041,7 +1041,10 @@
;; G_SPAWN_ERROR_CHDIR, /* changing to working dir failed */
;; G_SPAWN_ERROR_ACCES, /* execv() returned EACCES */
;; G_SPAWN_ERROR_PERM, /* execv() returned EPERM */
-;; G_SPAWN_ERROR_2BIG, /* execv() returned E2BIG */
+;; G_SPAWN_ERROR_TOO_BIG,/* execv() returned E2BIG */
+;; #ifndef G_DISABLE_DEPRECATED
+;; G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG,
+;; #endif
;; G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
;; G_SPAWN_ERROR_NAMETOOLONG, /* "" "" ENAMETOOLONG */
;; G_SPAWN_ERROR_NOENT, /* "" "" ENOENT */
@@ -1069,6 +1072,7 @@
'("chdir" "G_SPAWN_ERROR_CHDIR" "2")
'("acces" "G_SPAWN_ERROR_ACCES" "3")
'("perm" "G_SPAWN_ERROR_PERM" "4")
+ '("too-big" "G_SPAWN_ERROR_TOO_BIG" "5")
'("2big" "G_SPAWN_ERROR_2BIG" "5")
'("noexec" "G_SPAWN_ERROR_NOEXEC" "6")
'("nametoolong" "G_SPAWN_ERROR_NAMETOOLONG" "7")
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index 3d60dc6..4da0924 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -531,6 +531,7 @@
'("chdir" "G_SPAWN_ERROR_CHDIR")
'("acces" "G_SPAWN_ERROR_ACCES")
'("perm" "G_SPAWN_ERROR_PERM")
+ '("too-big" "G_SPAWN_ERROR_TOO_BIG")
'("2big" "G_SPAWN_ERROR_2BIG")
'("noexec" "G_SPAWN_ERROR_NOEXEC")
'("nametoolong" "G_SPAWN_ERROR_NAMETOOLONG")
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index c234264..f90d47b 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -299,11 +299,6 @@
(return-type "GType")
)
-(define-function g_value_array_get_type
- (c-name "g_value_array_get_type")
- (return-type "GType")
-)
-
;; From gclosure.h
@@ -468,6 +463,20 @@
)
)
+(define-function g_cclosure_marshal_generic_va
+ (c-name "g_cclosure_marshal_generic_va")
+ (return-type "none")
+ (parameters
+ '("GClosure*" "closure")
+ '("GValue*" "return_value")
+ '("gpointer" "instance")
+ '("va_list" "args_list")
+ '("gpointer" "marshal_data")
+ '("int" "n_params")
+ '("GType*" "param_types")
+ )
+)
+
;; From genums.h
@@ -1878,6 +1887,16 @@
(varargs #t)
)
+(define-function g_signal_set_va_marshaller
+ (c-name "g_signal_set_va_marshaller")
+ (return-type "none")
+ (parameters
+ '("guint" "signal_id")
+ '("GType" "instance_type")
+ '("GSignalCVaMarshaller" "va_marshaller")
+ )
+)
+
(define-function g_signal_emitv
(c-name "g_signal_emitv")
(return-type "none")
@@ -2852,6 +2871,11 @@
;; From gvaluearray.h
+(define-function g_value_array_get_type
+ (c-name "g_value_array_get_type")
+ (return-type "GType")
+)
+
(define-method get_nth
(of-object "GValueArray")
(c-name "g_value_array_get_nth")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
