X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgbytesicon.c;h=413e8bd963a9ca1717b19b82e1c65343356d49d7;hb=7103484017ff000d01ed94567539d37fa09b32b2;hp=dea13cc3cc15eea1ca869ef7ce0a94d4f09d2dec;hpb=706e636ab83de76c22ed7f2e56df9a1bcb49b39a;p=platform%2Fupstream%2Fglib.git diff --git a/gio/gbytesicon.c b/gio/gbytesicon.c index dea13cc..413e8bd 100644 --- a/gio/gbytesicon.c +++ b/gio/gbytesicon.c @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library; if not, see . * * Author: Ryan Lortie */ @@ -34,7 +32,7 @@ /** * SECTION:gbytesicon - * @short_description: An icon stored in memory as a #GBytes + * @short_description: An icon stored in memory as a GBytes * @include: gio/gio.h * @see_also: #GIcon, #GLoadableIcon, #GBytes * @@ -189,7 +187,7 @@ g_bytes_icon_hash (GIcon *icon) static gboolean g_bytes_icon_equal (GIcon *icon1, - GIcon *icon2) + GIcon *icon2) { GBytesIcon *bytes1 = G_BYTES_ICON (icon1); GBytesIcon *bytes2 = G_BYTES_ICON (icon2); @@ -223,6 +221,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); }