luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-08 10:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/tintou/gdesktopappinfo-nullable' into 'master'

Browse Source 
gdesktopappinfo: Add several nullable annotation to GAppInfo getters

See merge request GNOME/glib!1463
This commit is contained in:
Philip Withnall
2020-05-07 10:31:53 +00:00
parent e4e875a91f 0663a9bd56
commit 217f1ea3fb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdesktopappinfo.c
View File

@@ -4320,7 +4320,7 @@ g_app_info_reset_type_associations (const char *content_type)
* *
* Gets the default #GAppInfo for a given content type. * Gets the default #GAppInfo for a given content type.
* *
* Returns: (transfer full): #GAppInfo for given @content_type or * Returns: (transfer full) (nullable): #GAppInfo for given @content_type or
* %NULL on error. * %NULL on error.
*/ */
GAppInfo * GAppInfo *
@@ -4397,7 +4397,8 @@ out:
* of the URI, up to but not including the ':', e.g. "http", * of the URI, up to but not including the ':', e.g. "http",
* "ftp" or "sip". * "ftp" or "sip".
* *
* Returns: (transfer full): #GAppInfo for given @uri_scheme or %NULL on error. * Returns: (transfer full) (nullable): #GAppInfo for given @uri_scheme or
* %NULL on error.
*/ */
GAppInfo * GAppInfo *
g_app_info_get_default_for_uri_scheme (const char *uri_scheme) g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
@@ -4640,7 +4641,8 @@ g_desktop_app_info_lookup_default_init (GDesktopAppInfoLookupInterface *iface)
* in a GIO module. There is no reason for applications to use it * in a GIO module. There is no reason for applications to use it
* directly. Applications should use g_app_info_get_default_for_uri_scheme(). * directly. Applications should use g_app_info_get_default_for_uri_scheme().
* *
* Returns: (transfer full): #GAppInfo for given @uri_scheme or %NULL on error. * Returns: (transfer full) (nullable): #GAppInfo for given @uri_scheme or
* %NULL on error.
* *
* Deprecated: 2.28: The #GDesktopAppInfoLookup interface is deprecated and * Deprecated: 2.28: The #GDesktopAppInfoLookup interface is deprecated and
* unused by GIO. * unused by GIO.