summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Wood <thos@gnome.org>2010-12-20 16:50:26 +0000
committerThomas Wood <thos@gnome.org>2010-12-20 16:50:26 +0000
commitdfd897496bd46f90187016041c0408856ac9693d (patch)
treed944854f13ac460d71263f0e4a1c96f6699ef775
parent70604ba4588cf2a58b988a45f76128a9ed0836a5 (diff)
sound: Remove the reconnect timeout during the dispose of GvcMixerControl
Remove the reconnect timeout so that the callback function is not called after the object has been destroyed.
-rw-r--r--panels/sound/gvc-mixer-control.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
index 6f05be34d..0635e639e 100644
--- a/panels/sound/gvc-mixer-control.c
+++ b/panels/sound/gvc-mixer-control.c
@@ -1993,6 +1993,11 @@ gvc_mixer_control_dispose (GObject *object)
{
GvcMixerControl *control = GVC_MIXER_CONTROL (object);
+ if (control->priv->reconnect_id != 0) {
+ g_source_remove (control->priv->reconnect_id);
+ control->priv->reconnect_id = 0;
+ }
+
if (control->priv->pa_context != NULL) {
pa_context_unref (control->priv->pa_context);
control->priv->pa_context = NULL;