summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2017-03-14 14:47:17 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2017-03-14 14:47:17 +0100
commit32d254faed82bdba58caf3595358c7584d2c38f9 (patch)
tree586c1983f5232b1378dfbd2e03861aaca33bf634
parente2f5c88d2d0379be30cb908c233d280ed9c6f43d (diff)
downloadgobject-introspection-32d254faed82bdba58caf3595358c7584d2c38f9.tar.gz
gir: Update annotations from GLib git master
-rw-r--r--gir/gio-2.0.c38
1 files changed, 37 insertions, 1 deletions
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index 56651de4..105a47c1 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -2455,6 +2455,13 @@
/**
+ * GOsxAppInfo:
+ *
+ * Information about an installed application from a NSBundle.
+ */
+
+
+/**
* GPermission:
*
* #GPermission is an opaque data structure and can only be accessed
@@ -5466,6 +5473,8 @@
* On Win32 it is an extension string like ".doc", ".txt" or a perceived
* string like "audio". Such strings can be looked up in the registry at
* HKEY_CLASSES_ROOT.
+ * On OSX it is a [Uniform Type Identifier](https://en.wikipedia.org/wiki/Uniform_Type_Identifier)
+ * such as "com.apple.application".
*/
@@ -7374,6 +7383,18 @@
/**
+ * SECTION:gosxappinfo
+ * @title: GOsxAppInfo
+ * @short_description: Application information from NSBundles
+ * @include: gio/gosxappinfo.h
+ *
+ * #GOsxAppInfo is an implementation of #GAppInfo based on NSBundle information.
+ *
+ * Note that `<gio/gosxappinfo.h>` is unique to OSX.
+ */
+
+
+/**
* SECTION:goutputstream
* @short_description: Base class for implementing streaming output
* @include: gio/gio.h
@@ -15160,12 +15181,27 @@
/**
+ * g_content_type_is_mime_type:
+ * @type: a content type string
+ * @mime_type: a mime type string
+ *
+ * Determines if @type is a subset of @mime_type.
+ * Convenience wrapper around g_content_type_is_a().
+ *
+ * Returns: %TRUE if @type is a kind of @mime_type,
+ * %FALSE otherwise.
+ * Since: 2.52
+ */
+
+
+/**
* g_content_type_is_unknown:
* @type: a content type string
*
* Checks if the content type is the generic "unknown" type.
* On UNIX this is the "application/octet-stream" mimetype,
- * while on win32 it is "*".
+ * while on win32 it is "*" and on OSX it is a dynamic type
+ * or octet-stream.
*
* Returns: %TRUE if the type is the unknown type.
*/