luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 12:25:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

GIcon: NULLify the `type' out param in the sync methods too

Browse Source 
Both g_[file|bytes]_icon_load() leave the `type' out parameter
untouched, while the async methods g_[file|bytes]_icon_load_finish()
always set it to NULL.

For consistency's sake NULLify it in the sync methods too.

https://bugzilla.gnome.org/show_bug.cgi?id=700725
This commit is contained in:
Emanuele Aina 2013-05-20 15:53:40 +01:00
parent 7a861ab4c9
commit 3382ac99be
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gbytesicon.c
View File

@ -223,6 +223,9 @@ g_bytes_icon_load (GLoadableIcon *icon,
{ {
GBytesIcon *bytes_icon = G_BYTES_ICON (icon); GBytesIcon *bytes_icon = G_BYTES_ICON (icon);
if (type)
*type = NULL;
return g_memory_input_stream_new_from_bytes (bytes_icon->bytes); return g_memory_input_stream_new_from_bytes (bytes_icon->bytes);
} }

3
gio/gfileicon.c
View File

@ -288,6 +288,9 @@ g_file_icon_load (GLoadableIcon *icon,
stream = g_file_read (file_icon->file, stream = g_file_read (file_icon->file,
cancellable, cancellable,
error); error);
if (stream && type)
*type = NULL;
return G_INPUT_STREAM (stream); return G_INPUT_STREAM (stream);
} }