diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-01-11 04:08:47 -0600 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-01-11 04:08:47 -0600 |
| commit | 293f1f77d2fa67a2eb77fdacb10d5b4bf5e82663 (patch) | |
| tree | eda56da8b3fc46e9978cf888faa2f1c303db4562 | |
| parent | 590a3ad4a7bf384a7023365c85e127a42cd4b5b2 (diff) | |
| download | ayatana-indicator-sound-293f1f77d2fa67a2eb77fdacb10d5b4bf5e82663.tar.gz ayatana-indicator-sound-293f1f77d2fa67a2eb77fdacb10d5b4bf5e82663.tar.bz2 ayatana-indicator-sound-293f1f77d2fa67a2eb77fdacb10d5b4bf5e82663.zip | |
handle disconnection gracefully
| -rw-r--r-- | .bzrignore | 5 | ||||
| -rw-r--r-- | src/indicator-sound.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -76,3 +76,8 @@ src/playlists-menu-item.c src/settings-manager.c src/title-menu-item.c src/transport-menu-item.c +modified: +src/indicator-sound.c +data/com.canonical.indicators.sound.gschema.valid +tests/libmockpulse.la +tests/libmockpulse_la-mockpulse.lo diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 9d108d8..1ca3447 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -7,7 +7,6 @@ Copyright 2010 Canonical Ltd. Authors: Conor Curran <conor.curran@canonical.com> Ted Gould <ted@canonical.com> - Cody Russell <cody.russell@canonical.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published @@ -386,6 +385,7 @@ connection_changed (IndicatorServiceManager * sm, GError *error = NULL; if (connected == FALSE){ + update_state (STATE_SINKS_NONE); return; //TODO: Gracefully handle disconnection // do a timeout to wait for reconnection @@ -396,7 +396,7 @@ connection_changed (IndicatorServiceManager * sm, // we don't need to anything, gdbus takes care of the rest - bless. // just fetch the state. if (priv->dbus_proxy != NULL){ - fetch_state (indicator); + fetch_state (indicator); return; } |