summaryrefslogtreecommitdiff
path: root/gir/gio-2.0.c
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@t-online.de>2012-05-24 08:27:36 +0200
committerRico Tzschichholz <ricotz@t-online.de>2012-05-24 08:27:36 +0200
commite348fa5bf89f3da14257bd05c7801053ebeb74df (patch)
tree3bcc53e2aca06c2ece48fb31bd9c8b4b437aee49 /gir/gio-2.0.c
parentd055d35a873be5978d82df3955d859399c2e30d9 (diff)
downloadgobject-introspection-e348fa5bf89f3da14257bd05c7801053ebeb74df.tar.gz
Update glib annotations from git
Diffstat (limited to 'gir/gio-2.0.c')
-rw-r--r--gir/gio-2.0.c62
1 files changed, 59 insertions, 3 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 6f7c4072..84ca7bac 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -7733,6 +7733,12 @@
*
* Creates a new #GAppInfo from the given information.
*
+ * Note that for @commandline, the quoting rules of the Exec key of the
+ * <ulink url="http://freedesktop.org/Standards/desktop-entry-spec">freedesktop.org Desktop
+ * Entry Specification</ulink> are applied. For example, if the @commandline contains
+ * percent-encoded URIs, the percent-character must be doubled in order to prevent it from
+ * being swallowed by Exec key unquoting. See the specification for exact quoting rules.
+ *
* Returns: (transfer full): new #GAppInfo for given command.
*/
@@ -7938,6 +7944,22 @@
/**
+ * g_app_info_get_supported_types:
+ * @info: a #GAppInfo that can handle files
+ *
+ * Retrieves the list of content types that @app_info claims to support.
+ * If this information is not provided by the environment, this function
+ * will return %NULL.
+ * This function does not take in consideration associations added with
+ * g_app_info_add_supports_type(), but only those exported directly by
+ * the application.
+ *
+ * Returns: (transfer none) (array zero-terminated=1) (element-type utf8): a list of content types.
+ * Since: 2.34
+ */
+
+
+/**
* g_app_info_launch:
* @appinfo: a #GAppInfo
* @files: (element-type GFile): a #GList of #GFile objects
@@ -20565,6 +20587,17 @@
/**
+ * g_memory_input_stream_add_bytes:
+ * @stream: a #GMemoryInputStream
+ * @bytes: input data
+ *
+ * Appends @bytes to data that can be read from the input stream.
+ *
+ * Since: 2.34
+ */
+
+
+/**
* g_memory_input_stream_add_data:
* @stream: a #GMemoryInputStream
* @data: (array length=len) (element-type guint8) (transfer full): input data
@@ -20585,6 +20618,17 @@
/**
+ * g_memory_input_stream_new_from_bytes:
+ * @bytes: a #GBytes
+ *
+ * Creates a new #GMemoryInputStream with data from the given @bytes.
+ *
+ * Returns: new #GInputStream read from @bytes
+ * Since: 2.34
+ */
+
+
+/**
* g_memory_input_stream_new_from_data:
* @data: (array length=len) (element-type guint8) (transfer full): input data
* @len: length of the data, may be -1 if @data is a nul-terminated string
@@ -20673,6 +20717,18 @@
/**
+ * g_memory_output_stream_steal_as_bytes:
+ * @ostream: a #GMemoryOutputStream
+ *
+ * Returns data from the @ostream as a #GBytes. @ostream must be
+ * closed before calling this function.
+ *
+ * Returns: (transfer full): the stream's data
+ * Since: 2.34
+ */
+
+
+/**
* g_memory_output_stream_steal_data:
* @ostream: a #GMemoryOutputStream
*
@@ -20709,7 +20765,7 @@
* @detailed_action: (allow-none): the detailed action string, or %NULL
*
* Convenience function for appending a normal menu item to the end of
- * @menu. Combine g_menu_new() and g_menu_insert_item() for a more
+ * @menu. Combine g_menu_item_new() and g_menu_insert_item() for a more
* flexible alternative.
*
* Since: 2.32
@@ -20855,7 +20911,7 @@
* @detailed_action: (allow-none): the detailed action string, or %NULL
*
* Convenience function for inserting a normal menu item into @menu.
- * Combine g_menu_new() and g_menu_insert_item() for a more flexible
+ * Combine g_menu_item_new() and g_menu_insert_item() for a more flexible
* alternative.
*
* Since: 2.32
@@ -21496,7 +21552,7 @@
* @detailed_action: (allow-none): the detailed action string, or %NULL
*
* Convenience function for prepending a normal menu item to the start
- * of @menu. Combine g_menu_new() and g_menu_insert_item() for a more
+ * of @menu. Combine g_menu_item_new() and g_menu_insert_item() for a more
* flexible alternative.
*
* Since: 2.32