From 947e415ae432d1f0ec0d95955c0d8a71323eb4c1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 22 Feb 2012 15:25:29 -0600 Subject: fix set_accessible_desc() to update the entries' accessible_desc fields and emit the accessible-desc-changed signal --- src/indicator-power.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/indicator-power.c b/src/indicator-power.c index a5092c1..d3d929f 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -402,12 +402,23 @@ static void set_accessible_desc (IndicatorPower *self, const gchar *desc) { - if (desc == NULL || desc[0] == '\0') - return; - - g_free (self->accessible_desc); - - self->accessible_desc = g_strdup (desc); + if (desc && *desc) + { + /* update our copy of the string */ + char * old_desc = self->accessible_desc; + self->accessible_desc = g_strdup (desc); + g_free (old_desc); + + /* have the entries use our string */ + GList * l; + GList * entries = indicator_object_get_entries(INDICATOR_OBJECT(self)); + for (l=entries; l!=NULL; l=l->next) { + IndicatorObjectEntry * entry = l->data; + entry->accessible_desc = self->accessible_desc; + g_signal_emit (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID, 0, entry); + } + g_list_free (entries); + } } static const gchar * -- cgit v1.2.3