diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-17 21:22:07 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-06-17 21:22:07 +0000 |
| commit | 20c7b65ffc1a9ffd9ada8a228f730b8e19171fd9 (patch) | |
| tree | 3d1b008a1dde7dcfbc263c22eed5f8a531fd0417 | |
| parent | d5fd946327dc47aa4272711205af88b668a99683 (diff) | |
| parent | d5d01f6b8ed6b68d9d804e33dfba2739dfee2719 (diff) | |
| download | libayatana-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.
| -rw-r--r-- | libindicator/indicator-ng.c | 9 |
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) |