[glib] gio: g_menu_item_set_icon should not fail if icon is NULL
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gio: g_menu_item_set_icon should not fail if icon is NULL
- Date: Mon, 10 Aug 2015 17:03:40 +0000 (UTC)
commit 34277d69960960aeeb936629fc4c5326c7414f25
Author: Felix Riemann <friemann gnome org>
Date: Sun Aug 9 23:13:38 2015 +0200
gio: g_menu_item_set_icon should not fail if icon is NULL
It allows passing a NULL icon to unset the icon and thus should not
log a critical warning if used like that.
https://bugzilla.gnome.org/show_bug.cgi?id=753285
gio/gmenu.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gio/gmenu.c b/gio/gmenu.c
index fe82ba7..e90fb14 100644
--- a/gio/gmenu.c
+++ b/gio/gmenu.c
@@ -1375,7 +1375,7 @@ g_menu_item_set_icon (GMenuItem *menu_item,
GVariant *value;
g_return_if_fail (G_IS_MENU_ITEM (menu_item));
- g_return_if_fail (G_IS_ICON (icon));
+ g_return_if_fail (icon == NULL || G_IS_ICON (icon));
if (icon != NULL)
value = g_icon_serialize (icon);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]