From d5d01f6b8ed6b68d9d804e33dfba2739dfee2719 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 16 Jun 2013 23:45:30 -0500 Subject: in indicator_ng_update_entry, unconditionally call set_label, set_icon, set_accessible. Previously these were only called if the respective fields weren't NULL, which made it impossible to, for example, turn off a label or icon once it had been set. --- libindicator/indicator-ng.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libindicator') diff --git a/libindicator/indicator-ng.c b/libindicator/indicator-ng.c index 3465254..b58a6c3 100644 --- a/libindicator/indicator-ng.c +++ b/libindicator/indicator-ng.c @@ -273,12 +273,9 @@ indicator_ng_update_entry (IndicatorNg *self) else g_warning ("the action of the indicator menu item must have state with type (sssb) or a{sv}"); - if (label) - indicator_ng_set_label (self, label); - if (icon) - indicator_ng_set_icon_from_variant (self, icon); - if (accessible_desc) - indicator_ng_set_accessible_desc (self, accessible_desc); + indicator_ng_set_label (self, label); + indicator_ng_set_icon_from_variant (self, icon); + indicator_ng_set_accessible_desc (self, accessible_desc); indicator_object_set_visible (INDICATOR_OBJECT (self), visible); if (icon) -- cgit v1.2.3