diff options
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/gio-2.0.c | 117 | ||||
| -rw-r--r-- | gir/glib-2.0.c | 28 | ||||
| -rw-r--r-- | gir/gobject-2.0.c | 3 |
3 files changed, 134 insertions, 14 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0ebadc78..db413910 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -2402,7 +2402,7 @@ /** * GTaskThreadFunc: * @task: the #GTask - * @source_object: @task's source object + * @source_object: (type GObject): @task's source object * @task_data: @task's task data * @cancellable: @task's #GCancellable, or %NULL * @@ -10316,6 +10316,23 @@ /** + * g_application_command_line_create_file_for_arg: + * @cmdline: a #GApplicationCommandLine + * @arg: an argument from @cmdline + * + * Creates a #GFile corresponding to a filename that was given as part + * of the invocation of @cmdline. + * + * This differs from g_file_new_for_commandline_arg() in that it + * resolves relative pathnames using the current working directory of + * the invoking process rather than the local process. + * + * Returns: (transfer full): a new #GFile + * Since: 2.36 + */ + + +/** * g_application_command_line_get_arguments: * @cmdline: a #GApplicationCommandLine * @argc: (out) (allow-none): the length of the arguments array, or %NULL @@ -16999,6 +17016,20 @@ /** + * g_desktop_app_info_get_boolean: + * @info: a #GDesktopAppInfo + * @key: the key to look up + * + * Looks up a boolean value in the keyfile backing @info. + * + * The @key is looked up in the "Desktop Entry" group. + * + * Returns: the boolean value, or %FALSE if the key is not found + * Since: 2.36 + */ + + +/** * g_desktop_app_info_get_categories: * @info: a #GDesktopAppInfo * @@ -17100,6 +17131,33 @@ /** + * g_desktop_app_info_get_string: + * @info: a #GDesktopAppInfo + * @key: the key to look up + * + * Looks up a string value in the keyfile backing @info. + * + * The @key is looked up in the "Desktop Entry" group. + * + * Returns: a newly allocated string, or %NULL if the key is not found + * Since: 2.36 + */ + + +/** + * g_desktop_app_info_has_key: + * @info: a #GDesktopAppInfo + * @key: the key to look up + * + * Returns whether @key exists in the "Desktop Entry" group + * of the keyfile backing @info. + * + * Returns: %TRUE if the @key exists + * Since: 2.26 + */ + + +/** * g_desktop_app_info_launch_uris_as_manager: * @appinfo: a #GDesktopAppInfo * @uris: (element-type utf8): List of URIs @@ -18330,7 +18388,7 @@ * returned. * * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will - * be returned. If the file is not a directory, the %G_FILE_ERROR_NOTDIR + * be returned. If the file is not a directory, the %G_IO_ERROR_NOT_DIRECTORY * error will be returned. Other errors are possible too. * * Returns: (transfer full): A #GFileEnumerator if successful, %NULL on error. Free the returned object with g_object_unref(). @@ -19030,6 +19088,19 @@ /** + * g_file_info_get_deletion_date: + * @info: a #GFileInfo. + * + * Returns the #GDateTime representing the deletion date of the file, as + * available in G_FILE_ATTRIBUTE_TRASH_DELETION_DATE. If the + * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE attribute is unset, %NULL is returned. + * + * Returns: a #GDateTime, or %NULL. + * Since: 2.36 + */ + + +/** * g_file_info_get_display_name: * @info: a #GFileInfo. * @@ -20071,6 +20142,28 @@ /** + * g_file_new_for_commandline_arg_and_cwd: + * @arg: a command line string + * @cwd: the current working directory of the commandline + * + * Creates a #GFile with the given argument from the command line. + * + * This function is similar to g_file_new_for_commandline_arg() except + * that it allows for passing the current working directory as an + * argument instead of using the current working directory of the + * process. + * + * This is useful if the commandline argument was given in a context + * other than the invocation of the current process. + * + * See also g_application_command_line_create_file_for_arg(). + * + * Returns: (transfer full): a new #GFile + * Since: 2.36 + */ + + +/** * g_file_new_for_path: * @path: a string containing a relative or absolute path. The string must be encoded in the glib filename encoding. * @@ -23079,6 +23172,16 @@ /** + * g_memory_output_stream_new_resizable: + * + * Creates a new #GMemoryOutputStream, using g_realloc() and g_free() + * for memory allocation. + * + * Since: 2.36 + */ + + +/** * g_memory_output_stream_steal_as_bytes: * @ostream: a #GMemoryOutputStream * @@ -30913,7 +31016,7 @@ * Gets the source object from @task. Like * g_async_result_get_source_object(), but does not ref the object. * - * Returns: (transfer none): @task's source object, or %NULL + * Returns: (transfer none) (type GObject): @task's source object, or %NULL * Since: 2.36 */ @@ -30954,7 +31057,7 @@ /** * g_task_is_valid: * @result: (type Gio.AsyncResult): A #GAsyncResult - * @source_object: (allow-none): the source object expected to be associated with the task + * @source_object: (allow-none) (type GObject): the source object expected to be associated with the task * * Checks that @result is a #GTask, and that @source_object is its * source object (or that @source_object is %NULL and @result has no @@ -30967,7 +31070,7 @@ /** * g_task_new: - * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @source_object: (allow-none) (type GObject): the #GObject that owns this task, or %NULL. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. @@ -31052,7 +31155,7 @@ /** * g_task_report_error: - * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @source_object: (allow-none) (type GObject): the #GObject that owns this task, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. * @source_tag: an opaque pointer indicating the source of this task @@ -31073,7 +31176,7 @@ /** * g_task_report_new_error: - * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @source_object: (allow-none) (type GObject): the #GObject that owns this task, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. * @source_tag: an opaque pointer indicating the source of this task diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 24ed46ec..ec3aa02b 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -6486,16 +6486,21 @@ * easy-to-use form. * * In order to use these macros in an application, you must include - * <filename>glib/gi18n.h</filename>. For use in a library, must include + * <filename>glib/gi18n.h</filename>. For use in a library, you must include * <filename>glib/gi18n-lib.h</filename> <emphasis>after</emphasis> defining * the GETTEXT_PACKAGE macro suitably for your library: * |[ * #define GETTEXT_PACKAGE "gtk20" * #include <glib/gi18n-lib.h> * ]| - * Note that you also have to call setlocale() and textdomain() (as well as - * bindtextdomain() and bind_textdomain_codeset()) early on in your main() - * to make gettext() work. + * For an application, note that you also have to call bindtextdomain(), + * bind_textdomain_codeset(), textdomain() and setlocale() early on in your + * main() to make gettext() work. + * + * For a library, you only have to call bindtextdomain() and + * bind_textdomain_codeset() in your initialization function. If your library + * doesn't have an initialization function, you can call the functions before + * the first translated message. * * The gettext manual covers details of how to set up message extraction * with xgettext. @@ -12565,7 +12570,7 @@ * * Calculates the difference in time between @end and @begin. The * #GTimeSpan that is returned is effectively @end - @begin (ie: - * positive if the first simparameter is larger). + * positive if the first parameter is larger). * * Returns: the difference between the two #GDateTime, as a time span expressed in microseconds. * Since: 2.26 @@ -27163,7 +27168,7 @@ * */ * g_test_expect_message (G_LOG_DOMAIN, * G_LOG_LEVEL_CRITICAL, - * "assertion.*acquired_context.*failed"); + * "assertion*acquired_context*failed"); * g_main_context_push_thread_default (bad_context); * g_test_assert_expected_messages (); * ]| @@ -27296,6 +27301,16 @@ /** + * g_test_initialized: + * + * Returns %TRUE if g_test_init() has been called. + * + * Returns: %TRUE if g_test_init() has been called. + * Since: 2.36 + */ + + +/** * g_test_log_buffer_free: * * Internal function for gtester to free test log messages, no ABI guarantees provided. @@ -29695,6 +29710,7 @@ * using g_source_remove(). * * Returns: An ID (greater than 0) for the event source + * Rename to: g_unix_signal_add * Since: 2.30 */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 5d6f3e55..fff5b1b0 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -586,7 +586,8 @@ * /* restore floating state */ * if (was_floating) * g_object_force_floating (object); - * g_object_unref (object); /* release previously acquired reference */ + * else + * g_object_unref (object); /* release previously acquired reference */ * ]| */ |