aboutsummaryrefslogtreecommitdiff
path: root/libindicator/indicator-ng.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-17 21:22:07 +0000
committerTarmac <Unknown>2013-06-17 21:22:07 +0000
commit20c7b65ffc1a9ffd9ada8a228f730b8e19171fd9 (patch)
tree3d1b008a1dde7dcfbc263c22eed5f8a531fd0417 /libindicator/indicator-ng.c
parentd5fd946327dc47aa4272711205af88b668a99683 (diff)
parentd5d01f6b8ed6b68d9d804e33dfba2739dfee2719 (diff)
downloadlibayatana-indicator-20c7b65ffc1a9ffd9ada8a228f730b8e19171fd9.tar.gz
libayatana-indicator-20c7b65ffc1a9ffd9ada8a228f730b8e19171fd9.tar.bz2
libayatana-indicator-20c7b65ffc1a9ffd9ada8a228f730b8e19171fd9.zip
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.
Approved by PS Jenkins bot, Ted Gould.
Diffstat (limited to 'libindicator/indicator-ng.c')
-rw-r--r--libindicator/indicator-ng.c9
1 files changed, 3 insertions, 6 deletions
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)