Commit 3382ac99 authored by Emanuele Aina's avatar Emanuele Aina

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

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
parent 7a861ab4
......@@ -223,6 +223,9 @@ g_bytes_icon_load (GLoadableIcon *icon,
{
GBytesIcon *bytes_icon = G_BYTES_ICON (icon);
if (type)
*type = NULL;
return g_memory_input_stream_new_from_bytes (bytes_icon->bytes);
}
......
......@@ -288,6 +288,9 @@ g_file_icon_load (GLoadableIcon *icon,
stream = g_file_read (file_icon->file,
cancellable,
error);
if (stream && type)
*type = NULL;
return G_INPUT_STREAM (stream);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment