From: Rico Tzschichholz Date: Fri, 4 Jan 2013 18:26:04 +0000 (+0100) Subject: Update annotations from glib git X-Git-Tag: GOBJECT_INTROSPECTION_1_35_4~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58dfa52828fed9c0ed75a4d9b2b863738d1b65e0;p=platform%2Fupstream%2Fgobject-introspection.git Update annotations from glib git --- diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index fa45337..0ca00c0 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -5559,7 +5559,7 @@ * * Unmounting a #GMount instance is an asynchronous operation. For * more information about asynchronous operations, see #GAsyncResult - * and #GSimpleAsyncResult. To unmount a #GMount instance, first call + * and #GTask. To unmount a #GMount instance, first call * g_mount_unmount_with_operation() with (at least) the #GMount instance and a * #GAsyncReadyCallback. The callback will be fired when the * operation has resolved (either with success or failure), and a @@ -7702,9 +7702,9 @@ * * Mounting a #GVolume instance is an asynchronous operation. For more * information about asynchronous operations, see #GAsyncResult and - * #GSimpleAsyncResult. To mount a #GVolume, first call - * g_volume_mount() with (at least) the #GVolume instance, optionally - * a #GMountOperation object and a #GAsyncReadyCallback. + * #GTask. To mount a #GVolume, first call g_volume_mount() with (at + * least) the #GVolume instance, optionally a #GMountOperation object + * and a #GAsyncReadyCallback. * * Typically, one will only want to pass %NULL for the * #GMountOperation if automounting all volumes when a desktop session @@ -10461,6 +10461,26 @@ /** + * g_application_command_line_get_stdin_data: + * @cmdline: a #GApplicationCommandLine + * + * Gets the stdin of the invoking process. + * + * The #GInputStream can be used to read data passed to the standard + * input of the invoking process. + * This doesn't work on all platforms. Presently, it is only available + * on UNIX when using a DBus daemon capable of passing file descriptors. + * If stdin is not available then %NULL will be returned. In the + * future, support may be expanded to other platforms. + * + * You must only call this function once per commandline invocation. + * + * Returns: (transfer full): a #GInputStream for stdin + * Since: 2.34 + */ + + +/** * g_application_command_line_getenv: * @cmdline: a #GApplicationCommandLine * @name: the environment variable to get @@ -12343,6 +12363,23 @@ /** + * g_credentials_get_unix_pid: + * @credentials: A #GCredentials + * @error: Return location for error or %NULL. + * + * Tries to get the UNIX process identifier from @credentials. This + * method is only available on UNIX platforms. + * + * This operation can fail if #GCredentials is not supported on the + * OS or if the native credentials type does not contain information + * about the UNIX process ID. + * + * Returns: The UNIX process ID, or -1 if @error is set. + * Since: 2.36 + */ + + +/** * g_credentials_get_unix_user: * @credentials: A #GCredentials * @error: Return location for error or %NULL. @@ -19991,6 +20028,12 @@ * triggering the cancellable object from another thread. If the operation * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. * + * It does not make sense for @flags to contain + * %G_FILE_MONITOR_WATCH_HARD_LINKS, since hard links can not be made to + * directories. It is not possible to monitor all the files in a + * directory for changes made via hard links; if you want to do this then + * you must register individual watches with g_file_monitor(). + * * Virtual: monitor_dir * Returns: (transfer full): a #GFileMonitor for the given @file, or %NULL on error. Free the returned object with g_object_unref(). */ @@ -20027,6 +20070,14 @@ * triggering the cancellable object from another thread. If the operation * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. * + * If @flags contains %G_FILE_MONITOR_WATCH_HARD_LINKS then the monitor + * will also attempt to report changes made to the file via another + * filename (ie, a hard link). Without this flag, you can only rely on + * changes made through the filename contained in @file to be + * reported. Using this flag may result in an increase in resource + * usage, and may not have any effect depending on the #GFileMonitor + * backend and/or filesystem type. + * * Returns: (transfer full): a #GFileMonitor for the given @file, or %NULL on error. Free the returned object with g_object_unref(). */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 4c858e2..180577b 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -11361,6 +11361,8 @@ * @mutex: a #GMutex that is currently locked * * Atomically releases @mutex and waits until @cond is signalled. + * When this function returns, @mutex is locked again and owned by the + * calling thread. * * When using condition variables, it is possible that a spurious wakeup * may occur (ie: g_cond_wait() returns even though g_cond_signal() was @@ -14633,6 +14635,19 @@ /** + * g_get_num_processors: + * + * Determine the approximate number of threads that the system will + * schedule simultaneously for this process. This is intended to be + * used as a parameter to g_thread_pool_new() for CPU bound tasks and + * similar cases. + * + * Returns: Number of schedulable threads, always greater than 0 + * Since: 2.36 + */ + + +/** * g_get_prgname: * * Gets the name of the program. This name should not @@ -19255,6 +19270,28 @@ /** + * g_markup_parse_context_ref: + * @context: a #GMarkupParseContext + * + * Increases the reference count of @context. + * + * Returns: the same @context + * Since: 2.36 + */ + + +/** + * g_markup_parse_context_unref: + * @context: a #GMarkupParseContext + * + * Decreases the reference count of @context. When its reference count + * drops to 0, it is freed. + * + * Since: 2.36 + */ + + +/** * g_markup_printf_escaped: * @format: printf() style format string * @...: the arguments to insert in the format string @@ -28376,20 +28413,50 @@ * something that would pass as a valid value for the * TZ environment variable (including %NULL). * + * In Windows, @identifier can also be the unlocalized name of a time + * zone for standard time, for example "Pacific Standard Time". + * * Valid RFC3339 time offsets are "Z" (for UTC) or * "±hh:mm". ISO 8601 additionally specifies - * "±hhmm" and "±hh". - * - * The TZ environment variable typically corresponds - * to the name of a file in the zoneinfo database, but there are many - * other possibilities. Note that those other possibilities are not - * currently implemented, but are planned. + * "±hhmm" and "±hh". Offsets are + * time values to be added to Coordinated Universal Time (UTC) to get + * the local time. + * + * In Unix, the TZ environment variable typically + * corresponds to the name of a file in the zoneinfo database, or + * string in "std offset [dst [offset],start[/time],end[/time]]" + * (POSIX) format. There are no spaces in the specification. The + * name of standard and daylight savings time zone must be three or more + * alphabetic characters. Offsets are time values to be added to local + * time to get Coordinated Universal Time (UTC) and should be + * "[±]hh[[:]mm[:ss]]". Dates are either + * "Jn" (Julian day with n between 1 and 365, leap + * years not counted), "n" (zero-based Julian day + * with n between 0 and 365) or "Mm.w.d" (day d + * (0 <= d <= 6) of week w (1 <= w <= 5) of month m (1 <= m <= 12), day + * 0 is a Sunday). Times are in local wall clock time, the default is + * 02:00:00. + * + * In Windows, the "tzn[+|–]hh[:mm[:ss]][dzn]" format is used, but also + * accepts POSIX format. The Windows format uses US rules for all time + * zones; daylight savings time is 60 minutes behind the standard time + * with date and time of change taken from Pacific Standard Time. + * Offsets are time values to be added to the local time to get + * Coordinated Universal Time (UTC). * * g_time_zone_new_local() calls this function with the value of the * TZ environment variable. This function itself is * independent of the value of TZ, but if @identifier * is %NULL then /etc/localtime will be consulted - * to discover the correct timezone. + * to discover the correct time zone on Unix and the registry will be + * consulted or GetTimeZoneInformation() will be used to get the local + * time zone on Windows. + * + * If intervals are not available, only time zone rules from + * TZ environment variable or other means, then they + * will be computed from year 1900 to 2037. If the maximum year for the + * rules is available and it is greater than 2037, then it will followed + * instead. * * See RFC3339 @@ -28398,7 +28465,10 @@ * full list of valid time offsets. See The * GNU C Library manual for an explanation of the possible - * values of the TZ environment variable. + * values of the TZ environment variable. See + * Microsoft Time Zone Index Values for the list of time zones + * on Windows. * * You should release the return value by calling g_time_zone_unref() * when you are done with it.