aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-03-13 16:08:31 -0500
committerTed Gould <ted@gould.cx>2014-03-13 16:08:31 -0500
commitf37625ab59b1d41c7c9986f05ee402790e3be039 (patch)
tree4a3c1a3b858c0bec56f4849e64daf52fe3947eb2
parent661dc6ed9f771c8f84677aefd951c5e9a5505038 (diff)
parentccfe01dbcb292ae482068e03db65400577a46136 (diff)
downloadayatana-indicator-sound-f37625ab59b1d41c7c9986f05ee402790e3be039.tar.gz
ayatana-indicator-sound-f37625ab59b1d41c7c9986f05ee402790e3be039.tar.bz2
ayatana-indicator-sound-f37625ab59b1d41c7c9986f05ee402790e3be039.zip
Sync to latest account-service-player
-rw-r--r--debian/control2
-rw-r--r--src/accounts-service-user.vala5
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index ad6b4fb..40576bd 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9.0),
autotools-dev,
valac (>= 0.20),
libaccountsservice-dev,
- libdbustest1-dev,
+ libdbustest1-dev (>= 14.04.1),
libgirepository1.0-dev,
libglib2.0-dev (>= 2.22.3),
libgtest-dev,
diff --git a/src/accounts-service-user.vala b/src/accounts-service-user.vala
index debf8bb..ad2cef3 100644
--- a/src/accounts-service-user.vala
+++ b/src/accounts-service-user.vala
@@ -110,6 +110,11 @@ public class AccountsServiceUser : Object {
~AccountsServiceUser () {
this.player = null;
+
+ if (this.timer != 0) {
+ GLib.Source.remove(this.timer);
+ this.timer = 0;
+ }
}
void new_proxy (GLib.Object? obj, AsyncResult res) {