aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-12-01 17:27:40 +0000
committerConor Curran <conor.curran@canonical.com>2011-12-01 17:27:40 +0000
commit184964f9cff611809ffb37a498ec9e114a4f37b0 (patch)
tree6a2aeb4fdfeb755312bcd95f7e112047bae66a51
parentb5974163f01f207200064f56ab4818257411834e (diff)
parentbe80e257f60d48a8892abdd70d405f67aea45636 (diff)
downloadayatana-indicator-sound-184964f9cff611809ffb37a498ec9e114a4f37b0.tar.gz
ayatana-indicator-sound-184964f9cff611809ffb37a498ec9e114a4f37b0.tar.bz2
ayatana-indicator-sound-184964f9cff611809ffb37a498ec9e114a4f37b0.zip
merged fix for accessible string fix on start up to indicate current level
-rw-r--r--src/indicator-sound.c6
-rw-r--r--src/volume-widget.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index f45d926..b953449 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -419,6 +419,9 @@ new_volume_slider_widget(DbusmenuMenuitem * newitem,
}
volume_widget = volume_widget_new (newitem, io);
priv->volume_widget = volume_widget;
+ // Don't forget to set the accessible desc.
+ update_accessible_desc (io);
+
GtkWidget* ido_slider_widget = volume_widget_get_ido_slider(VOLUME_WIDGET(priv->volume_widget));
@@ -759,8 +762,7 @@ update_accessible_desc (IndicatorObject * io)
}
entry->accessible_desc = priv->accessible_desc;
- g_free (old_desc);
-
+ g_free (old_desc);
g_signal_emit(G_OBJECT(io),
INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID,
0,
diff --git a/src/volume-widget.c b/src/volume-widget.c
index e8e7bae..f2bf6ed 100644
--- a/src/volume-widget.c
+++ b/src/volume-widget.c
@@ -195,7 +195,6 @@ volume_widget_set_twin_item(VolumeWidget* self,
initial_level = 0;
}
gtk_range_set_value(range, initial_level);
- update_accessible_desc(priv->indicator);
}
static gboolean