Updating branch refs/heads/master to 21fe3ab4185b7eba72b5554f4645c8945be3da27 (commit) from f6252759fcb4aa2e510237aa45c77b84bfab3cc4 (commit)
commit 21fe3ab4185b7eba72b5554f4645c8945be3da27 Author: Eric Koegel <eric.koe...@gmail.com> Date: Mon Aug 19 11:47:00 2013 +0300 Check GFileInfo before trying to use it. src/xfdesktop-file-icon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/xfdesktop-file-icon.c b/src/xfdesktop-file-icon.c index 7673ea7..1d2ddcc 100644 --- a/src/xfdesktop-file-icon.c +++ b/src/xfdesktop-file-icon.c @@ -269,6 +269,11 @@ xfdesktop_file_icon_add_emblems(XfdesktopFileIcon *icon) else return NULL; + icon->priv->gicon = emblemed_icon; + + if(!G_IS_FILE_INFO(xfdesktop_file_icon_peek_file_info(icon))) + return emblemed_icon; + /* Get the list of emblems */ emblem_names = g_file_info_get_attribute_stringv(xfdesktop_file_icon_peek_file_info(icon), "metadata::emblems"); @@ -289,7 +294,7 @@ xfdesktop_file_icon_add_emblems(XfdesktopFileIcon *icon) /* Clear out the old icon and set the new one */ xfdesktop_file_icon_invalidate_icon(icon); - return icon->priv->gicon = emblemed_icon; + return emblemed_icon; } void _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits