From e40da89a473b15b64d036cdce2e1ead59770778b Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Tue, 23 Feb 2016 13:48:46 +0100 Subject: Created new class AccountsServiceAccess to hold all accounts service operations --- src/service.vala | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index d72f16e..2a50b53 100644 --- a/src/service.vala +++ b/src/service.vala @@ -20,7 +20,9 @@ public class IndicatorSound.Service: Object { DBusConnection bus; - public Service (MediaPlayerList playerlist, VolumeControl volume, AccountsServiceUser? accounts, Options options, VolumeWarning volume_warning) { + public Service (MediaPlayerList playerlist, VolumeControl volume, AccountsServiceUser? accounts, Options options, VolumeWarning volume_warning, AccountsServiceAccess? accounts_service_access) { + + _accounts_service_access = accounts_service_access; try { bus = Bus.get_sync(GLib.BusType.SESSION); @@ -111,13 +113,13 @@ public class IndicatorSound.Service: Object { this.menus.@foreach ( (profile, menu) => { menu.last_player_updated.connect ((player_id) => { - this.volume_control.last_running_player = player_id; + this._accounts_service_access.last_running_player = player_id; }); }); - this.volume_control.notify["last-running-player"].connect(() => { + this._accounts_service_access.notify["last-running-player"].connect(() => { this.menus.@foreach ( (profile, menu) => { - menu.set_default_player (this.volume_control.last_running_player); + menu.set_default_player (this._accounts_service_access.last_running_player); }); }); @@ -204,6 +206,7 @@ public class IndicatorSound.Service: Object { private Options _options; private VolumeWarning _volume_warning; private IndicatorSound.InfoNotification _info_notification = new IndicatorSound.InfoNotification(); + private AccountsServiceAccess _accounts_service_access; const double volume_step_percentage = 0.06; -- cgit v1.2.3