Check for NULL content types.

2008-01-10  A. Walton  <awalton@svn.gnome.org>

	* gdesktopappinfo.c: (g_app_info_get_all_for_type),
	(g_app_info_get_default_for_type):
	Check for NULL content types.

svn path=/trunk/; revision=6290
This commit is contained in:
A. Walton 2008-01-10 13:25:41 +00:00 committed by Andrew Walton
parent 7fe31089ff
commit d43b188954
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2008-01-10 A. Walton <awalton@svn.gnome.org>
* gdesktopappinfo.c: (g_app_info_get_all_for_type),
(g_app_info_get_default_for_type):
Check for NULL content types.
2008-01-10 Frederic Crozat <fcrozat@mandriva.com> 2008-01-10 Frederic Crozat <fcrozat@mandriva.com>
* gunixmounts.c: add rpc_pipefs to systemfs list (#508309). * gunixmounts.c: add rpc_pipefs to systemfs list (#508309).

View File

@ -1572,7 +1572,8 @@ app_info_in_list (GAppInfo *info,
* *
* Gets a list of all #GAppInfo s for a given content type. * Gets a list of all #GAppInfo s for a given content type.
* *
* Returns: #GList of #GAppInfo s for given @content_type. * Returns: #GList of #GAppInfo s for given @content_type
* or %NULL on error.
**/ **/
GList * GList *
g_app_info_get_all_for_type (const char *content_type) g_app_info_get_all_for_type (const char *content_type)
@ -1581,6 +1582,8 @@ g_app_info_get_all_for_type (const char *content_type)
GList *infos; GList *infos;
GDesktopAppInfo *info; GDesktopAppInfo *info;
g_return_val_if_fail (content_type != NULL, NULL);
desktop_entries = get_all_desktop_entries_for_mime_type (content_type); desktop_entries = get_all_desktop_entries_for_mime_type (content_type);
infos = NULL; infos = NULL;
@ -1613,7 +1616,7 @@ g_app_info_get_all_for_type (const char *content_type)
* *
* Gets the #GAppInfo that correspond to a given content type. * Gets the #GAppInfo that correspond to a given content type.
* *
* Returns: #GAppInfo for given @content_type. * Returns: #GAppInfo for given @content_type or %NULL on error.
**/ **/
GAppInfo * GAppInfo *
g_app_info_get_default_for_type (const char *content_type, g_app_info_get_default_for_type (const char *content_type,
@ -1622,6 +1625,8 @@ g_app_info_get_default_for_type (const char *content_type,
GList *desktop_entries, *l; GList *desktop_entries, *l;
GAppInfo *info; GAppInfo *info;
g_return_val_if_fail (content_type != NULL, NULL);
desktop_entries = get_all_desktop_entries_for_mime_type (content_type); desktop_entries = get_all_desktop_entries_for_mime_type (content_type);
info = NULL; info = NULL;