Merge lp:~ted/indicator-sound/sound-stream-cleanup into lp:indicator-sound/15.04

[Ted Gould]

[lp:~ted/indicator-sound/sound-stream-cleanup]

498. By Ted Gould on 2015-01-30

Merging the indicator-test branch

499. By Ted Gould on 2015-01-30

Put an abstraction in for the focus tracker so we can mock it

500. By Ted Gould on 2015-01-30

Add a focus tracker mock

501. By Ted Gould on 2015-01-30

Add a mock symbol for stream restore checking

502. By Ted Gould on 2015-01-30

Adding another missing symbol

503. By Ted Gould on 2015-02-13

Merging in the notifications mock branch

Unmerged revisions

503. By Ted Gould on 2015-02-13

Merging in the notifications mock branch

502. By Ted Gould on 2015-01-30

Adding another missing symbol

501. By Ted Gould on 2015-01-30

Add a mock symbol for stream restore checking

500. By Ted Gould on 2015-01-30

Add a focus tracker mock

499. By Ted Gould on 2015-01-30

Put an abstraction in for the focus tracker so we can mock it

498. By Ted Gould on 2015-01-30

Merging the indicator-test branch

497. By Ted Gould on 2014-12-17

Set it up so the end we're detecting that the stream changes, and then looking up values based on that.

496. By Ted Gould on 2014-12-17

Warn when we stop because of not being able to get a name

495. By Ted Gould on 2014-12-17

Making sure all the media player lists can use standard object primitivs

494. By Ted Gould on 2014-12-17

Bind the property into a value in volume control

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-12 02:00:36 +0000
+++ CMakeLists.txt	2015-01-30 23:01:09 +0000
@@ -49,7 +49,7 @@
 
 pkg_check_modules(
   TEST REQUIRED
-  dbustest-1
+  dbustest-1>=15.04.0
 )
 include_directories(${TEST_INCLUDE_DIRS})
 

=== modified file 'debian/control'
--- debian/control	2014-10-03 20:52:10 +0000
+++ debian/control	2015-01-30 23:01:09 +0000
@@ -6,14 +6,14 @@
 Build-Depends: debhelper (>= 9.0),
                cmake,
                dbus,
-               dbus-test-runner (>= 14.04.0+14.04.20140226),
+               dbus-test-runner (>> 14.04.0+14.04.20150120.1),
                dh-translations,
                gir1.2-accountsservice-1.0,
                gnome-common,
                autotools-dev,
                valac (>= 0.20),
                libaccountsservice-dev,
-               libdbustest1-dev (>= 14.04.1),
+               libdbustest1-dev (>= 15.04.0),
                libgirepository1.0-dev,
                libglib2.0-dev (>= 2.22.3),
                libgtest-dev,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-01-27 17:42:26 +0000
+++ src/CMakeLists.txt	2015-01-30 23:01:09 +0000
@@ -36,6 +36,7 @@
     --vapidir=.
     --pkg=url-dispatcher
     --pkg=bus-watcher
+    --pkg=libpulse-ext-stream-restore
 )
 
 vala_add(indicator-sound-service
@@ -47,9 +48,12 @@
     media-player-list
     mpris2-interfaces
     accounts-service-user
+    focus-tracker
 )
 vala_add(indicator-sound-service
   volume-control.vala
+  DEPENDS
+    focus-tracker
 )
 vala_add(indicator-sound-service
   media-player.vala
@@ -120,6 +124,14 @@
 vala_add(indicator-sound-service
   greeter-broadcast.vala
 )
+vala_add(indicator-sound-service
+  focus-tracker.vala
+)
+vala_add(indicator-sound-service
+  focus-tracker-stack.vala
+  DEPENDS
+    focus-tracker
+)
 
 vala_finish(indicator-sound-service
   SOURCES
@@ -154,6 +166,7 @@
 
 add_definitions(
   -w
+  -DG_LOG_DOMAIN="indicator-sound"
 )
 
 add_library(

=== added file 'src/focus-tracker-stack.vala'
--- src/focus-tracker-stack.vala	1970-01-01 00:00:00 +0000
+++ src/focus-tracker-stack.vala	2015-01-30 23:01:09 +0000
@@ -0,0 +1,88 @@
+/*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+private struct WindowInfo {
+	public uint window_id;
+	public string app_id;
+	public bool focused;
+	public uint stage;
+}
+
+/*
+private struct DesktopInfo {
+	public string app_id;
+	public string desktop_file;
+}
+*/
+
+[DBus (name = "com.canonical.Unity.WindowStack")]
+private interface WindowStack : Object {
+	/* public abstract async DesktopInfo GetAppIdFromPid (uint pid) throws IOError; */
+	public abstract async WindowInfo[] GetWindowStack () throws IOError;
+	/* public abstract async string[] GetWindowProperties (uint window_id, string app_id, string[] names) throws IOError; */
+
+	public signal void FocusedWindowChanged (uint window_id, string app_id, uint stage);
+	/* public signal void WindowCreated (uint window_id, string app_id); */
+	/* public signal void WindowDestroyed (uint window_id, string app_id); */
+}
+
+public class FocusTrackerStack : FocusTracker {
+	public override string focused_appid { get; private set; default = "unknown"; }
+	private WindowStack proxy;
+
+	public FocusTrackerStack ( ) {
+		build_proxies.begin();
+	}
+
+	private async void build_proxies() {
+		try {
+			proxy = yield Bus.get_proxy<WindowStack>(BusType.SESSION,
+				"com.canonical.Unity.WindowStack",
+				"/com/canonical/Unity/WindowStack",
+				DBusProxyFlags.DO_NOT_LOAD_PROPERTIES,
+				null);
+
+			proxy.FocusedWindowChanged.connect((window, appid, stage) => {
+				if (stage == 0) {
+					debug("Focus changed to: %s", appid);
+					this.focused_appid = appid;
+				}
+			});
+
+			update_focused_appid.begin();
+		} catch (Error e) {
+			warning("Unable to create window stack proxy: %s", e.message);
+		}
+	}
+
+	private async void update_focused_appid () {
+		try {
+			var windows = yield proxy.GetWindowStack();
+			foreach (var window in windows) {
+				if (window.focused && window.stage == 0) {
+					focused_appid = window.app_id;
+					break;
+				}
+			}
+		} catch (Error e) {
+			warning("Unable to get window stack list: %s", e.message);
+		}
+	}
+}

=== added file 'src/focus-tracker.vala'
--- src/focus-tracker.vala	1970-01-01 00:00:00 +0000
+++ src/focus-tracker.vala	2015-01-30 23:01:09 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public abstract class FocusTracker : Object {
+	public virtual string focused_appid { get; protected set; }
+}

=== modified file 'src/main.c'
--- src/main.c	2014-02-25 22:47:45 +0000
+++ src/main.c	2015-01-30 23:01:09 +0000
@@ -1,6 +1,21 @@
-/* main.c generated by valac 0.22.1, the Vala compiler
- * generated from main.vala, do not modify */
-
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
 
 #include <glib.h>
 #include <locale.h>
@@ -29,10 +44,13 @@
 		playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new());
 	}
 
-	service = indicator_sound_service_new (playerlist);
+	FocusTracker * tracker = FOCUS_TRACKER(focus_tracker_stack_new());
+
+	service = indicator_sound_service_new (playerlist, tracker);
 	result = indicator_sound_service_run (service);
 
 	g_object_unref(playerlist);
+	g_object_unref(tracker);
 	g_object_unref(service);
 
 	return result;

=== modified file 'src/media-player-list.vala'
--- src/media-player-list.vala	2014-02-24 22:47:50 +0000
+++ src/media-player-list.vala	2015-01-30 23:01:09 +0000
@@ -17,7 +17,7 @@
  *      Ted Gould <[e-mail]>
  */
 
-public class MediaPlayerList {
+public class MediaPlayerList : Object {
 	public class Iterator {
 		public virtual MediaPlayer? next_value() {
 			return null;

=== modified file 'src/service.vala'
--- src/service.vala	2015-01-29 17:31:03 +0000
+++ src/service.vala	2015-01-30 23:01:09 +0000
@@ -18,7 +18,7 @@
  */
 
 public class IndicatorSound.Service: Object {
-	public Service (MediaPlayerList playerlist) {
+	public Service (MediaPlayerList playerlist, FocusTracker tracker) {
 		sync_notification = new Notify.Notification(_("Volume"), "", "audio-volume-muted");
 		this.notification_server_watch = GLib.Bus.watch_name(GLib.BusType.SESSION,
 			"org.freedesktop.Notifications",
@@ -32,7 +32,13 @@
 		this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET);
 		this.notify["visible"].connect ( () => this.update_root_icon () );
 
-		this.volume_control = new VolumeControl ();
+		this.focus_tracker = tracker;
+
+		this.volume_control = new VolumeControl (this.focus_tracker);
+		this.volume_control.notify["stream"].connect(() => {
+			this.update_sync_notification();
+		});
+		this.volume_control.bind_property ("media-playing", this, "player-playing", BindingFlags.SYNC_CREATE);
 
 		/* If we're on the greeter, don't export */
 		if (GLib.Environment.get_user_name() != "lightdm") {
@@ -177,7 +183,9 @@
 	Settings settings;
 	Settings sharedsettings;
 	VolumeControl volume_control;
+	FocusTracker focus_tracker;
 	MediaPlayerList players;
+	public bool player_playing { get; set; default = false; }
 	uint player_action_update_id;
 	bool mute_blocks_sound;
 	uint sound_was_blocked_timeout_id;
@@ -288,7 +296,7 @@
 			return;
 
 		/* Determine Label */
-		string volume_label = "";
+		string volume_label = volume_control.stream; /* TODO: Undo this */
 		if (volume_control.high_volume)
 			volume_label = _("High volume");
 
@@ -362,7 +370,7 @@
 		});
 
 		mute_action.change_state.connect ( (action, val) => {
-			volume_control.set_mute (val.get_boolean ());
+			volume_control.mute = val.get_boolean ();
 		});
 
 		this.volume_control.notify["mute"].connect ( () => {
@@ -475,6 +483,7 @@
 	}
 
 	void name_lost (DBusConnection connection, string name) {
+		warning("Unable to get DBus Name: %s", name);
 		this.loop.quit ();
 	}
 
@@ -493,6 +502,7 @@
 
 	bool update_player_actions () {
 		bool clear_accounts_player = true;
+		bool player_playing = false;
 
 		foreach (var player in this.players) {
 			SimpleAction? action = this.actions.lookup_action (player.id) as SimpleAction;
@@ -512,11 +522,20 @@
 				accounts_service.player = player;
 				clear_accounts_player = false;
 			}
+
+			if (player.state == "Playing") {
+				player_playing = true;
+			}
 		}
 
 		if (clear_accounts_player)
 			clear_acts_player();
 
+		if (this.player_playing != player_playing) {
+			this.player_playing = player_playing;
+			update_root_icon();
+		}
+
 		this.player_action_update_id = 0;
 		return false;
 	}

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2015-01-29 17:31:55 +0000
+++ src/volume-control.vala	2015-01-30 23:01:09 +0000
@@ -19,6 +19,7 @@
  */
 
 using PulseAudio;
+using PulseAudio.Extension.StreamRestore;
 using Notify;
 using Gee;
 
@@ -37,29 +38,47 @@
 	/* this is static to ensure it being freed after @context (loop does not have ref counting) */
 	private static PulseAudio.GLibMainLoop loop;
 
+	private FocusTracker focus_tracker;
+	public bool media_playing { get; set; default = false; }
+
 	private uint _reconnect_timer = 0;
 
 	private PulseAudio.Context context;
 	private bool   _mute = true;
-	private bool   _is_playing = false;
+	public  bool   is_playing { get; private set; default = false; }
 	private double _volume = 0.0;
 	private double _mic_volume = 0.0;
 
 	/* Used by the pulseaudio stream restore extension */
-	private DBusConnection _pconn;
-	/* Need both the list and hash so we can retrieve the last known sink-input after
-	 * releasing the current active one (restoring back to the previous known role) */
-	private Gee.ArrayList<uint32> _sink_input_list = new Gee.ArrayList<uint32> ();
-	private HashMap<uint32, string> _sink_input_hash = new HashMap<uint32, string> ();
 	private bool _pulse_use_stream_restore = false;
-	private uint32 _active_sink_input = -1;
-	private string[] _valid_roles = {"multimedia", "alert", "alarm", "phone"};
-	private string? _objp_role_multimedia = null;
-	private string? _objp_role_alert = null;
-	private string? _objp_role_alarm = null;
-	private string? _objp_role_phone = null;
-	private uint _pa_volume_sig_count = 0;
-
+	private enum InputStreamType {
+		ALERT = 0,
+		ALARM = 1,
+		MULTIMEDIA = 2,
+		PHONE = 3
+	}
+	private InputStreamType currentstream = InputStreamType.ALERT;
+	private InputStreamType tempstream = InputStreamType.ALERT;
+	/** The name of the stream that we're currently playing */
+	public string stream {
+		get {
+			switch (this.currentstream) {
+				case InputStreamType.ALERT:
+					return "alert";
+				case InputStreamType.ALARM:
+					return "alarm";
+				case InputStreamType.MULTIMEDIA:
+					return "multimedia";
+				case InputStreamType.PHONE:
+					return "phone";
+			}
+
+			return "alert";
+		}
+	}
+
+
+	/* Accounts Service Variables */
 	private DBusProxy _user_proxy;
 	private GreeterListInterface _greeter_proxy;
 	private Cancellable _mute_cancellable;
@@ -68,7 +87,14 @@
 	private uint _accountservice_volume_timer = 0;
 	private bool _send_next_local_volume = false;
 	private double _account_service_volume = 0.0;
+
+
 	private bool _active_port_headphone = false;
+	/* There is not easy way to check if the port is a headset/headphone besides
+	 * checking for the port name. On touch (with the pulseaudio droid element)
+	 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
+	 * On the desktop this is usually called 'analog-output-headphones' */
+	private string[] headphone_outputs = {"output-wired_headset", "output-wired_headphone", "analog-output-headphones"};
 
 	/** true when connected to the pulse server */
 	public bool ready { get; set; }
@@ -79,12 +105,20 @@
 	/** true when high volume warnings should be shown */
 	public bool high_volume {
 		get {
-			return this._volume > 0.75 && _active_port_headphone;	
+			return this._volume > 0.75 && _active_port_headphone && stream == "multimedia";
 		}
 	}
 
-	public VolumeControl ()
+	public VolumeControl (FocusTracker tracker)
 	{
+		this.focus_tracker = tracker;
+		this.focus_tracker.notify["focused-appid"].connect(() => {
+			if (!this.ready)
+				return;
+
+			this.update_sink_input();
+		});
+
 		if (loop == null)
 			loop = new PulseAudio.GLibMainLoop ();
 
@@ -94,6 +128,13 @@
 		setup_accountsservice.begin ();
 
 		this.reconnect_to_pulse ();
+
+		this.notify["media-playing"].connect(() => {
+			update_sink_input();
+		});
+		this.notify["stream"].connect(() => {
+			update_stream();
+		});
 	}
 
 	~VolumeControl ()
@@ -106,7 +147,10 @@
 		stop_account_service_volume_timer();
 	}
 
-	/* PulseAudio logic*/
+	/************************/
+	/*   PulseAudio logic   */
+	/************************/
+
 	private void context_events_cb (Context c, Context.SubscriptionEventType t, uint32 index)
 	{
 		switch (t & Context.SubscriptionEventType.FACILITY_MASK)
@@ -116,23 +160,7 @@
 				break;
 
 			case Context.SubscriptionEventType.SINK_INPUT:
-				switch (t & Context.SubscriptionEventType.TYPE_MASK)
-				{
-					case Context.SubscriptionEventType.NEW:
-						c.get_sink_input_info (index, handle_new_sink_input_cb);
-						break;
-
-					case Context.SubscriptionEventType.CHANGE:
-						c.get_sink_input_info (index, handle_changed_sink_input_cb);
-						break;
-
-					case Context.SubscriptionEventType.REMOVE:
-						remove_sink_input_from_list (index);
-						break;
-					default:
-						debug ("Sink input event not known.");
-						break;
-				}
+				update_sink_input ();
 				break;
 
 			case Context.SubscriptionEventType.SOURCE:
@@ -143,7 +171,14 @@
 				switch (t & Context.SubscriptionEventType.TYPE_MASK)
 				{
 					case Context.SubscriptionEventType.NEW:
-						c.get_source_output_info (index, source_output_info_cb);
+						c.get_source_output_info (index, (context, info, eol) => {
+							if (info == null)
+								return;
+
+							var role = info.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
+							if (role == "phone" || role == "production")
+								this.active_mic = true;
+						});
 						break;
 
 					case Context.SubscriptionEventType.REMOVE:
@@ -154,291 +189,205 @@
 		}
 	}
 
-	private void sink_info_cb_for_props (Context c, SinkInfo? i, int eol)
-	{
-		bool old_high_volume = this.high_volume;
-
-		if (i == null)
-			return;
-
-		if (_mute != (bool)i.mute)
-		{
-			_mute = (bool)i.mute;
-			this.notify_property ("mute");
-		}
-
-		var playing = (i.state == PulseAudio.SinkState.RUNNING);
-		if (_is_playing != playing)
-		{
-			_is_playing = playing;
-			this.notify_property ("is-playing");
-		}
-
-		/* Check if the current active port is headset/headphone */
-		/* There is not easy way to check if the port is a headset/headphone besides
-		 * checking for the port name. On touch (with the pulseaudio droid element)
-		 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
-		 * On the desktop this is usually called 'analog-output-headphones' */
-		if (i.active_port != null &&
-			(i.active_port.name == "output-wired_headset" ||
-		 	 i.active_port.name == "output-wired_headphone" ||
-			 i.active_port.name == "analog-output-headphones")) {
-			_active_port_headphone = true;
-		} else {
-			_active_port_headphone = false;
-		}
-
-		if (_pulse_use_stream_restore == false &&
-				_volume != volume_to_double (i.volume.max ()))
-		{
-			_volume = volume_to_double (i.volume.max ());
-			this.notify_property("volume");
-			start_local_volume_timer();
-		} 
-		
-		if (this.high_volume != old_high_volume) {
-			this.notify_property("high-volume");
-		}
-	}
-
-	private void source_info_cb (Context c, SourceInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		if (_mic_volume != volume_to_double (i.volume.values[0]))
-		{
-			_mic_volume = volume_to_double (i.volume.values[0]);
-			this.notify_property ("mic-volume");
-		}
-	}
-
-	private void server_info_cb_for_props (Context c, ServerInfo? i)
-	{
-		if (i == null)
-			return;
-		context.get_sink_info_by_name (i.default_sink_name, sink_info_cb_for_props);
-	}
-
 	private void update_sink ()
 	{
-		context.get_server_info (server_info_cb_for_props);
-	}
-
-	private void update_source_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
-		if (i != null)
-			context.get_source_info_by_name (i.default_source_name, source_info_cb);
+		if (!this.ready)
+			return;
+
+		context.get_server_info ((context, info) => {
+			if (info == null)
+				return;
+
+			context.get_sink_info_by_name (info.default_sink_name, (context, info, eol) => {
+				bool old_high_volume = this.high_volume;
+
+				if (info == null)
+					return;
+
+				if (_mute != (bool)info.mute)
+				{
+					_mute = (bool)info.mute;
+					this.notify_property ("mute");
+				}
+
+				this.is_playing = (info.state == PulseAudio.SinkState.RUNNING);
+
+				/* Check if the current active port is headset/headphone */
+				if (info.active_port.name in headphone_outputs) {
+					_active_port_headphone = true;
+				} else {
+					_active_port_headphone = false;
+				}
+
+				if (_pulse_use_stream_restore == false &&
+						_volume != volume_to_double (info.volume.max ()))
+				{
+					_volume = volume_to_double (info.volume.max ());
+					this.notify_property("volume");
+					start_local_volume_timer();
+				} 
+				
+				if (this.high_volume != old_high_volume) {
+					this.notify_property("high-volume");
+				}
+			});
+		});
+	}
+
+	private void update_sink_input ()
+	{
+		if (!this.ready)
+			return;
+
+		if (!this._pulse_use_stream_restore)
+			return;
+
+		this.tempstream = InputStreamType.ALERT;
+		if (this.media_playing)
+			this.tempstream = InputStreamType.MULTIMEDIA;
+
+		context.get_sink_input_info_list((context, info, eol) => {
+			var inputstream = InputStreamType.ALARM;
+
+			if (info != null) {
+				var role = info.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
+				var corked = (info.corked != 0);
+				var appid = info.proplist.gets (PulseAudio.Proplist.PROP_APPLICATION_ID);
+
+				/* Override the corked value for the phone as it's always corked */
+				if (role != null && role == "phone")
+					corked = false;
+
+				if (!corked && role != null && appid == this.focus_tracker.focused_appid) {
+					switch (role) {
+						case "phone":
+							inputstream = InputStreamType.PHONE;
+							break;
+						case "alarm":
+							inputstream = InputStreamType.ALARM;
+							break;
+						case "alert":
+							inputstream = InputStreamType.ALERT;
+							break;
+						case "multimedia":
+						default:
+							/* We treat unknown roles (i.e. 'music') as multimedia */
+							inputstream = InputStreamType.MULTIMEDIA;
+							break;
+					}
+				}
+			}
+
+			if (inputstream > this.tempstream) {
+				this.tempstream = inputstream;
+			}
+
+			if (eol != 0) {
+				if (this.currentstream != this.tempstream) {
+					this.currentstream = this.tempstream;
+					debug("Current stream: %s", this.stream);
+					this.notify_property("stream");
+				}
+			}
+		});
+	}
+
+	/* Look at a given profile or role and figure out what our volume and
+	   mute settings should be based on that. */
+	private void update_stream ()
+	{
+
+
 	}
 
 	private void update_source ()
 	{
-		context.get_server_info (update_source_get_server_info_cb);
-	}
-
-	private DBusMessage pulse_dbus_filter (DBusConnection connection, owned DBusMessage message, bool incoming)
-	{
-		if (message.get_message_type () == DBusMessageType.SIGNAL) {
-			string active_role_objp = _objp_role_alert;
-			if (_active_sink_input != -1)
-				active_role_objp = _sink_input_hash.get (_active_sink_input);
-
-			if (message.get_path () == active_role_objp && message.get_member () == "VolumeUpdated") {
-				uint sig_count = 0;
-				lock (_pa_volume_sig_count) {
-					sig_count = _pa_volume_sig_count;
-					if (_pa_volume_sig_count > 0)
-						_pa_volume_sig_count--;
-				}
-
-				/* We only care about signals if our internal count is zero */
-				if (sig_count == 0) {
-					/* Extract volume and make sure it's not a side effect of us setting it */
-					Variant body = message.get_body ();
-					Variant varray = body.get_child_value (0);
-
-					uint32 type = 0, volume = 0;
-					VariantIter iter = varray.iterator ();
-					iter.next ("(uu)", &type, &volume);
-					/* Here we need to compare integer values to avoid rounding issues, so just
-					 * using the volume values used by pulseaudio */
-					PulseAudio.Volume cvolume = double_to_volume (_volume);
-					if (volume != cvolume) {
-						/* Someone else changed the volume for this role, reflect on the indicator */
-						_volume = volume_to_double (volume);
-						this.notify_property("volume");
-						start_local_volume_timer();
-					}
-				}
-			}
-		}
-
-		return message;
-	}
-
-	private async void update_active_sink_input (uint32 index)
-	{
-		if ((index == -1) || (index != _active_sink_input && index in _sink_input_list)) {
-			string sink_input_objp = _objp_role_alert;
-			if (index != -1)
-				sink_input_objp = _sink_input_hash.get (index);
-			_active_sink_input = index;
-
-			/* Listen for role volume changes from pulse itself (external clients) */
-			try {
-				var builder = new VariantBuilder (new VariantType ("ao"));
-				builder.add ("o", sink_input_objp);
-
-				yield _pconn.call ("org.PulseAudio.Core1", "/org/pulseaudio/core1",
-						"org.PulseAudio.Core1", "ListenForSignal",
-						new Variant ("(sao)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry.VolumeUpdated", builder),
-						null, DBusCallFlags.NONE, -1);
-			} catch (GLib.Error e) {
-				warning ("unable to listen for pulseaudio dbus signals (%s)", e.message);
-			}
-
-			try {
-				var props_variant = yield _pconn.call ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry",
-						sink_input_objp, "org.freedesktop.DBus.Properties", "Get",
-						new Variant ("(ss)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume"),
-						null, DBusCallFlags.NONE, -1);
-				Variant tmp;
-				props_variant.get ("(v)", out tmp);
-				uint32 type = 0, volume = 0;
-				VariantIter iter = tmp.iterator ();
-				iter.next ("(uu)", &type, &volume);
-
-				_volume = volume_to_double (volume);
-				this.notify_property("volume");
-				start_local_volume_timer();
-			} catch (GLib.Error e) {
-				warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message);
-			}
-		}
-	}
-
-	private void add_sink_input_into_list (SinkInputInfo sink_input)
-	{
-		/* We're only adding ones that are not corked and with a valid role */
-		var role = sink_input.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
-
-		if (role != null && role in _valid_roles) {
-			if (sink_input.corked == 0 || role == "phone") {
-				_sink_input_list.insert (0, sink_input.index);
-				switch (role)
+		if (!this.ready)
+			return;
+
+		context.get_server_info ((context, info) => {
+			if (info == null)
+				return;
+
+			context.get_source_info_by_name (info.default_source_name, (context, info, eol) => {
+				if (info == null)
+					return;
+
+				if (_mic_volume != volume_to_double (info.volume.values[0]))
 				{
-					case "multimedia":
-						_sink_input_hash.set (sink_input.index, _objp_role_multimedia);
-						break;
-					case "alert":
-						_sink_input_hash.set (sink_input.index, _objp_role_alert);
-						break;
-					case "alarm":
-						_sink_input_hash.set (sink_input.index, _objp_role_alarm);
-						break;
-					case "phone":
-						_sink_input_hash.set (sink_input.index, _objp_role_phone);
-						break;
+					_mic_volume = volume_to_double (info.volume.values[0]);
+					this.notify_property ("mic-volume");
 				}
-				/* Only switch the active sink input in case a phone one is not active */
-				if (_active_sink_input == -1 ||
-						_sink_input_hash.get (_active_sink_input) != _objp_role_phone)
-					update_active_sink_input.begin (sink_input.index);
-			}
-		}
-	}
-
-	private void remove_sink_input_from_list (uint32 index)
-	{
-		if (index in _sink_input_list) {
-			_sink_input_list.remove (index);
-			_sink_input_hash.unset (index);
-			if (index == _active_sink_input) {
-				if (_sink_input_list.size != 0)
-					update_active_sink_input.begin (_sink_input_list.get (0));
-				else
-					update_active_sink_input.begin (-1);
-			}
-		}
-	}
-
-	private void handle_new_sink_input_cb (Context c, SinkInputInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		add_sink_input_into_list (i);
-	}
-
-	private void handle_changed_sink_input_cb (Context c, SinkInputInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		if (i.index in _sink_input_list) {
-			/* Phone stream is always corked, so handle it differently */
-			if (i.corked == 1 && _sink_input_hash.get (i.index) != _objp_role_phone)
-				remove_sink_input_from_list (i.index);
-		} else {
-			if (i.corked == 0)
-				add_sink_input_into_list (i);
-		}
-	}
-
-	private void source_output_info_cb (Context c, SourceOutputInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		var role = i.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
-		if (role == "phone" || role == "production")
-			this.active_mic = true;
+			});
+		});
 	}
 
 	private void context_state_callback (Context c)
 	{
 		switch (c.get_state ()) {
 			case Context.State.READY:
-				if (_pulse_use_stream_restore) {
-					c.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
-							PulseAudio.Context.SubscriptionMask.SINK_INPUT |
-							PulseAudio.Context.SubscriptionMask.SOURCE |
-							PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
-				} else {
-					c.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
-							PulseAudio.Context.SubscriptionMask.SOURCE |
-							PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
-				}
-				c.set_subscribe_callback (context_events_cb);
-				update_sink ();
-				update_source ();
-				this.ready = true;
+				PulseAudio.Extension.StreamRestore.test(this.context, (context, version) => {
+					if (version != 0) {
+						debug("Got the stream restore extension");
+						_pulse_use_stream_restore = true;
+					} else {
+						debug("No stream restore extension found");
+					}
+
+					if (_pulse_use_stream_restore) {
+						this.context.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
+								PulseAudio.Context.SubscriptionMask.SINK_INPUT |
+								PulseAudio.Context.SubscriptionMask.SOURCE |
+								PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
+					} else {
+						this.context.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
+								PulseAudio.Context.SubscriptionMask.SOURCE |
+								PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
+					}
+					this.context.set_subscribe_callback (context_events_cb);
+					this.ready = true;
+
+					debug("Pulse state ready");
+
+					update_sink ();
+					update_sink_input ();
+					update_source ();
+					update_stream ();
+				});
+
 				break;
 
 			case Context.State.FAILED:
 			case Context.State.TERMINATED:
+				warning("Pulse state disconnected, retrying.");
+				this.ready = false;
 				if (_reconnect_timer == 0)
-					_reconnect_timer = Timeout.add_seconds (2, reconnect_timeout);
+					_reconnect_timer = Timeout.add_seconds (2, () => {
+						_reconnect_timer = 0;
+						reconnect_to_pulse ();
+						return false; // G_SOURCE_REMOVE
+					});
+				break;
+
+			case Context.State.CONNECTING:
+			case Context.State.AUTHORIZING:
+			case Context.State.SETTING_NAME:
+				debug(@"Pulse state initializing step $((int)c.get_state())");
 				break;
 
 			default:
-				this.ready = false;
+				warning("Unknown state returned by Pulse Audio context. Not reconnecting.");
 				break;
 		}
 	}
 
-	bool reconnect_timeout ()
-	{
-		_reconnect_timer = 0;
-		reconnect_to_pulse ();
-		return false; // G_SOURCE_REMOVE
-	}
-
 	void reconnect_to_pulse ()
 	{
 		if (this.ready) {
 			this.context.disconnect ();
 			this.context = null;
 			this.ready = false;
+			this._pulse_use_stream_restore = false;
 		}
 
 		var props = new Proplist ();
@@ -447,8 +396,6 @@
 		props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
 		props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
 
-		reconnect_pulse_dbus ();
-
 		this.context = new PulseAudio.Context (loop.get_api(), null, props);
 		this.context.set_state_callback (context_state_callback);
 
@@ -456,41 +403,35 @@
 			warning( "pa_context_connect() failed: %s\n", PulseAudio.strerror(context.errno()));
 	}
 
-	void sink_info_list_callback_set_mute (PulseAudio.Context context, PulseAudio.SinkInfo? sink, int eol) {
-		if (sink != null)
-			context.set_sink_mute_by_index (sink.index, true, null);
-	}
-
-	void sink_info_list_callback_unset_mute (PulseAudio.Context context, PulseAudio.SinkInfo? sink, int eol) {
-		if (sink != null)
-			context.set_sink_mute_by_index (sink.index, false, null);
-	}
-
-	/* Mute operations */
+	/******************************/
+	/*     Mute operations        */
+	/******************************/
+
 	bool set_mute_internal (bool mute)
 	{
-		return_val_if_fail (context.get_state () == Context.State.READY, false);
+		if (!this.ready)
+			return false;
 
 		if (_mute != mute) {
 			if (mute)
-				context.get_sink_info_list (sink_info_list_callback_set_mute);
+				context.get_sink_info_list ((context, sink, eol) => {
+					if (sink != null)
+						context.set_sink_mute_by_index (sink.index, true, null);
+				});
 			else
-				context.get_sink_info_list (sink_info_list_callback_unset_mute);
+				context.get_sink_info_list ((context, sink, eol) => {
+					if (sink != null)
+						context.set_sink_mute_by_index (sink.index, false, null);
+				});
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	public void set_mute (bool mute)
-	{
-		if (set_mute_internal (mute))
-			sync_mute_to_accountsservice.begin (mute);
-	}
-
 	public void toggle_mute ()
 	{
-		this.set_mute (!this._mute);
+		this.mute = !this._mute;
 	}
 
 	public bool mute
@@ -499,17 +440,17 @@
 		{
 			return this._mute;
 		}
-	}
-
-	public bool is_playing
-	{
-		get
+		set
 		{
-			return this._is_playing;
+			if (set_mute_internal (value))
+				sync_mute_to_accountsservice.begin (value);
 		}
 	}
 
-	/* Volume operations */
+	/******************************/
+	/*   Volume operations        */
+	/******************************/
+
 	private static PulseAudio.Volume double_to_volume (double vol)
 	{
 		double tmp = (double)(PulseAudio.Volume.NORM - PulseAudio.Volume.MUTED) * vol;
@@ -522,79 +463,41 @@
 		return tmp / (double)(PulseAudio.Volume.NORM - PulseAudio.Volume.MUTED);
 	}
 
-	private void set_volume_success_cb (Context c, int success)
-	{
-		if ((bool)success)
-			this.notify_property("volume");
-	}
-
-	private void sink_info_set_volume_cb (Context c, SinkInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		unowned CVolume cvol = i.volume;
-		cvol.scale (double_to_volume (_volume));
-		c.set_sink_volume_by_index (i.index, cvol, set_volume_success_cb);
-	}
-
-	private void server_info_cb_for_set_volume (Context c, ServerInfo? i)
-	{
-		if (i == null)
-		{
-			warning ("Could not get PulseAudio server info");
-			return;
-		}
-
-		context.get_sink_info_by_name (i.default_sink_name, sink_info_set_volume_cb);
-	}
-
-	private async void set_volume_active_role ()
-	{
-		string active_role_objp = _objp_role_alert;
-
-		if (_active_sink_input != -1 && _active_sink_input in _sink_input_list)
-			active_role_objp = _sink_input_hash.get (_active_sink_input);
-
-		try {
-			var builder = new VariantBuilder (new VariantType ("a(uu)"));
-			builder.add ("(uu)", 0, double_to_volume (_volume));
-			Variant volume = builder.end ();
-
-			/* Increase the signal counter so we can handle the callback */
-			lock (_pa_volume_sig_count) {
-				_pa_volume_sig_count++;
-			}
-
-			yield _pconn.call ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry",
-					active_role_objp, "org.freedesktop.DBus.Properties", "Set",
-					new Variant ("(ssv)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume", volume),
-					null, DBusCallFlags.NONE, -1);
-
-			this.notify_property("volume");
-		} catch (GLib.Error e) {
-			lock (_pa_volume_sig_count) {
-				_pa_volume_sig_count--;
-			}
-			warning ("unable to set volume for stream obj path %s (%s)", active_role_objp, e.message);
-		}
-	}
-
-	bool set_volume_internal (double volume)
-	{
-		if (context.get_state () != Context.State.READY)
+	bool set_volume_internal (double newvolume)
+	{
+		if (!this.ready)
 			return false;
 
-		if (_volume != volume) {
+		if (_volume != newvolume) {
 			var old_high_volume = this.high_volume;
-
-			_volume = volume;
-			if (_pulse_use_stream_restore)
-				set_volume_active_role.begin ();
-			else
-				context.get_server_info (server_info_cb_for_set_volume);
-
-			this.notify_property("volume");
+			/* Ideally, we'd be able to set this when we give the value to Pulse, but
+			   we kinda have a Vala bug that's messing up capturing the variables. So
+			   we're setting it here so that the VolumeControl object can track it all
+			   the way through */
+			/* https://bugzilla.gnome.org/show_bug.cgi?id=741485 */
+			_volume = newvolume;
+
+			context.get_server_info ((context, i) => {
+				if (i == null)
+				{
+					warning ("Could not get PulseAudio server info");
+					return;
+				}
+
+				context.get_sink_info_by_name (i.default_sink_name, (context, info, eol) => {
+					if (info == null)
+						return;
+
+					unowned CVolume cvol = info.volume;
+					cvol.scale (double_to_volume (this._volume));
+					context.set_sink_volume_by_index (info.index, cvol, (context, success) => {
+						if (!(bool)success)
+							return;
+
+						this.notify_property("volume");
+					});
+				});
+			});
 
 			if (this.high_volume != old_high_volume)
 				this.notify_property("high-volume");
@@ -605,20 +508,6 @@
 		}
 	}
 
-	void set_mic_volume_success_cb (Context c, int success)
-	{
-		if ((bool)success)
-			this.notify_property ("mic-volume");
-	}
-
-	void set_mic_volume_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
-		if (i != null) {
-			unowned CVolume cvol = CVolume ();
-			cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
-			c.set_source_volume_by_name (i.default_source_name, cvol, set_mic_volume_success_cb);
-		}
-	}
-
 	public double volume {
 		get {
 			return _volume;
@@ -635,94 +524,34 @@
 			return _mic_volume;
 		}
 		set {
-			return_if_fail (context.get_state () == Context.State.READY);
+			if (!this.ready)
+				return;
 
+			/* Ideally, we'd be able to set this when we give the value to Pulse, but
+			   we kinda have a Vala bug that's messing up capturing the variables. So
+			   we're setting it here so that the VolumeControl object can track it all
+			   the way through */
+			/* https://bugzilla.gnome.org/show_bug.cgi?id=741485 */
 			_mic_volume = value;
 
-			context.get_server_info (set_mic_volume_get_server_info_cb);
-		}
-	}
-
-	/* PulseAudio Dbus (Stream Restore) logic */
-	private void reconnect_pulse_dbus ()
-	{
-		unowned string pulse_dbus_server_env = Environment.get_variable ("PULSE_DBUS_SERVER");
-		string address;
-
-		/* In case of a reconnect */
-		_pulse_use_stream_restore = false;
-		_pa_volume_sig_count = 0;
-
-		if (pulse_dbus_server_env != null) {
-			address = pulse_dbus_server_env;
-		} else {
-			DBusConnection conn;
-			Variant props;
-
-			try {
-				conn = Bus.get_sync (BusType.SESSION);
-			} catch (GLib.IOError e) {
-				warning ("unable to get the dbus session bus: %s", e.message);
-				return;
-			}
-
-			try {
-				var props_variant = conn.call_sync ("org.PulseAudio1",
-						"/org/pulseaudio/server_lookup1", "org.freedesktop.DBus.Properties",
-						"Get", new Variant ("(ss)", "org.PulseAudio.ServerLookup1", "Address"),
-						null, DBusCallFlags.NONE, -1);
-				props_variant.get ("(v)", out props);
-				address = props.get_string ();
-			} catch (GLib.Error e) {
-				warning ("unable to get pulse unix socket: %s", e.message);
-				return;
-			}
-		}
-
-		stdout.printf ("PulseAudio dbus unix socket: %s\n", address);
-		try {
-			_pconn = new DBusConnection.for_address_sync (address, DBusConnectionFlags.AUTHENTICATION_CLIENT);
-		} catch (GLib.Error e) {
-			/* If it fails, it means the dbus pulse extension is not available */
-			return;
-		}
-
-		/* For pulse dbus related events */
-		_pconn.add_filter (pulse_dbus_filter);
-
-		/* Check if the 4 currently supported media roles are already available in StreamRestore
-		 * Roles: multimedia, alert, alarm and phone */
-		_objp_role_multimedia = stream_restore_get_object_path ("sink-input-by-media-role:multimedia");
-		_objp_role_alert = stream_restore_get_object_path ("sink-input-by-media-role:alert");
-		_objp_role_alarm = stream_restore_get_object_path ("sink-input-by-media-role:alarm");
-		_objp_role_phone = stream_restore_get_object_path ("sink-input-by-media-role:phone");
-
-		/* Only use stream restore if every used role is available */
-		if (_objp_role_multimedia != null && _objp_role_alert != null && _objp_role_alarm != null && _objp_role_phone != null) {
-			stdout.printf ("Using PulseAudio DBUS Stream Restore module\n");
-			/* Restore volume and update default entry */
-			update_active_sink_input.begin (-1);
-			_pulse_use_stream_restore = true;
-		}
-	}
-
-	private string? stream_restore_get_object_path (string name) {
-		string? objp = null;
-		try {
-			Variant props_variant = _pconn.call_sync ("org.PulseAudio.Ext.StreamRestore1",
-					"/org/pulseaudio/stream_restore1", "org.PulseAudio.Ext.StreamRestore1",
-					"GetEntryByName", new Variant ("(s)", name), null, DBusCallFlags.NONE, -1);
-			/* Workaround for older versions of vala that don't provide get_objv */
-			VariantIter iter = props_variant.iterator ();
-			iter.next ("o", &objp);
-			stdout.printf ("Found obj path %s for restore data named %s\n", objp, name);
-		} catch (GLib.Error e) {
-			warning ("unable to find stream restore data for: %s", name);
-		}
-		return objp;
-	}
-
+			context.get_server_info ((context, info) => {
+				if (info == null)
+					return;
+
+				unowned CVolume cvol = CVolume ();
+				cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
+				context.set_source_volume_by_name (info.default_source_name, cvol, (context, success) => {
+					if ((bool)success)
+						this.notify_property ("mic-volume");
+				});
+			});
+		}
+	}
+
+	/******************************/
 	/* AccountsService operations */
+	/******************************/
+
 	private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[]? invalidated_properties)
 	{
 		Variant volume_variant = changed_properties.lookup_value ("Volume", new VariantType ("d"));

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-01-28 15:41:22 +0000
+++ tests/CMakeLists.txt	2015-01-30 23:01:09 +0000
@@ -41,6 +41,9 @@
 vala_add(vala-mocks
 	media-player-mock.vala
 )
+vala_add(vala-mocks
+	focus-tracker-mock.vala
+)
 
 vala_finish(vala-mocks
 	SOURCES
@@ -92,6 +95,8 @@
 	pa-mock.cpp
 )
 
+target_link_libraries (pulse-mock ${PULSEAUDIO_LIBRARIES})
+
 ###########################
 # Name Watch Test
 ###########################
@@ -135,6 +140,7 @@
 	volume-control-test
 	indicator-sound-service-lib
 	pulse-mock
+	vala-mocks-lib
 	gtest
 	${TEST_LIBRARIES}
 )
@@ -207,3 +213,29 @@
 	greeter-list-test  --gtest_filter=GreeterListTest.BasicIterator
 )
 
+###########################
+# Indicator Test
+###########################
+
+add_definitions(
+	-DINDICATOR_SOUND_SERVICE_BINARY="${CMAKE_BINARY_DIR}/src/indicator-sound-service"
+	-DPA_MOCK_LIB="${CMAKE_CURRENT_BINARY_DIR}/libpulse-mock.so"
+)
+add_executable (indicator-test indicator-test.cc)
+target_link_libraries (
+	indicator-test
+	gtest
+	${SOUNDSERVICE_LIBRARIES}
+	${TEST_LIBRARIES}
+)
+
+# Split tests to work around libaccountservice sucking
+add_test(indcator-test-phone-menu
+	indicator-test  --gtest_filter=IndicatorTest.PhoneMenu
+)
+add_test(indcator-test-desktop-menu
+	indicator-test  --gtest_filter=IndicatorTest.DesktopMenu
+)
+add_test(indcator-test-silent-actions
+	indicator-test  --gtest_filter=IndicatorTest.SilentActions
+)

=== modified file 'tests/accounts-service-mock.h'
--- tests/accounts-service-mock.h	2014-03-04 21:24:10 +0000
+++ tests/accounts-service-mock.h	2015-01-30 23:01:09 +0000
@@ -17,6 +17,7 @@
  *      Ted Gould <[e-mail]>
  */
 
+#include <memory>
 #include <libdbustest/dbus-test.h>
 
 class AccountsServiceMock
@@ -24,11 +25,14 @@
 		DbusTestDbusMock * mock = nullptr;
 		DbusTestDbusMockObject * soundobj = nullptr;
 		DbusTestDbusMockObject * userobj = nullptr;
+		DbusTestDbusMockObject * syssoundobj = nullptr;
 
 	public:
 		AccountsServiceMock () {
 			mock = dbus_test_dbus_mock_new("org.freedesktop.Accounts");
 
+			dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SYSTEM);
+
 			DbusTestDbusMockObject * baseobj = dbus_test_dbus_mock_get_object(mock, "/org/freedesktop/Accounts", "org.freedesktop.Accounts", NULL);
 
 			dbus_test_dbus_mock_object_add_method(mock, baseobj,
@@ -80,6 +84,11 @@
 			dbus_test_dbus_mock_object_add_property(mock, soundobj,
 				"ArtUrl", G_VARIANT_TYPE_STRING,
 				g_variant_new_string(""), NULL);
+
+			syssoundobj = dbus_test_dbus_mock_get_object(mock, "/user", "com.ubuntu.touch.AccountsService.Sound", NULL);
+			dbus_test_dbus_mock_object_add_property(mock, syssoundobj,
+				"SilentMode", G_VARIANT_TYPE_BOOLEAN,
+				g_variant_new_boolean(FALSE), NULL);
 		}
 
 		~AccountsServiceMock () {
@@ -87,6 +96,18 @@
 			g_clear_object(&mock);
 		}
 
+		void setSilentMode (bool modeValue) {
+			dbus_test_dbus_mock_object_update_property(mock, syssoundobj,
+				"SilentMode", g_variant_new_boolean(modeValue ? TRUE : FALSE),
+				NULL);
+		}
+
+		operator std::shared_ptr<DbusTestTask> () {
+			return std::shared_ptr<DbusTestTask>(
+				DBUS_TEST_TASK(g_object_ref(mock)),
+				[](DbusTestTask * task) { g_clear_object(&task); });
+		}
+
 		operator DbusTestTask* () {
 			return DBUS_TEST_TASK(mock);
 		}

=== modified file 'tests/accounts-service-user.cc'
--- tests/accounts-service-user.cc	2014-03-03 20:50:52 +0000
+++ tests/accounts-service-user.cc	2015-01-30 23:01:09 +0000
@@ -42,14 +42,13 @@
 
 		virtual void SetUp() {
 			service = dbus_test_service_new(NULL);
+			dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_BOTH);
 
 			AccountsServiceMock service_mock;
 
 			dbus_test_service_add_task(service, (DbusTestTask*)service_mock);
 			dbus_test_service_start_tasks(service);
 
-			g_setenv("DBUS_SYSTEM_BUS_ADDRESS", g_getenv("DBUS_SESSION_BUS_ADDRESS"), TRUE);
-
 			session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
 			ASSERT_NE(nullptr, session);
 			g_dbus_connection_set_exit_on_close(session, FALSE);

=== added file 'tests/focus-tracker-mock.vala'
--- tests/focus-tracker-mock.vala	1970-01-01 00:00:00 +0000
+++ tests/focus-tracker-mock.vala	2015-01-30 23:01:09 +0000
@@ -0,0 +1,27 @@
+/*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public class FocusTrackerMock : FocusTracker {
+	public override string focused_appid { get; private set; default = "unknown"; }
+
+	public void mock_set_appid (string newappid) {
+		this.focused_appid = newappid;
+	}
+}

=== added file 'tests/indicator-fixture.h'
--- tests/indicator-fixture.h	1970-01-01 00:00:00 +0000
+++ tests/indicator-fixture.h	2015-01-30 23:01:09 +0000
@@ -0,0 +1,444 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <memory>
+#include <algorithm>
+#include <string>
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+#include <libdbustest/dbus-test.h>
+
+class IndicatorFixture : public ::testing::Test
+{
+	private:
+		std::string _indicatorPath;
+		std::string _indicatorAddress;
+		std::vector<std::shared_ptr<DbusTestTask>> _mocks;
+
+		class PerRunData {
+		public:
+			/* We're private in the fixture but other than that we don't care,
+			   we don't leak out. This object's purpose isn't to hide data it is
+			   to make the lifecycle of the items more clear. */
+			std::shared_ptr<GMenuModel>  _menu;
+			std::shared_ptr<GActionGroup> _actions;
+			DbusTestService * _session_service;
+			DbusTestService * _system_service;
+			DbusTestTask * _test_indicator;
+			DbusTestTask * _test_dummy;
+			GDBusConnection * _session;
+			GDBusConnection * _system;
+
+			PerRunData (const std::string& indicatorPath, const std::string& indicatorAddress, std::vector<std::shared_ptr<DbusTestTask>>& mocks)
+				: _menu(nullptr)
+				, _session(nullptr)
+			{
+				_session_service = dbus_test_service_new(nullptr);
+				dbus_test_service_set_bus(_session_service, DBUS_TEST_SERVICE_BUS_SESSION);
+
+				_system_service = dbus_test_service_new(nullptr);
+				dbus_test_service_set_bus(_system_service, DBUS_TEST_SERVICE_BUS_SYSTEM);
+
+				_test_indicator = DBUS_TEST_TASK(dbus_test_process_new(indicatorPath.c_str()));
+				dbus_test_task_set_name(_test_indicator, "Indicator");
+				dbus_test_service_add_task(_session_service, _test_indicator);
+
+				_test_dummy = dbus_test_task_new();
+				dbus_test_task_set_wait_for(_test_dummy, indicatorAddress.c_str());
+				dbus_test_task_set_name(_test_dummy, "Dummy");
+				dbus_test_service_add_task(_session_service, _test_dummy);
+
+				std::for_each(mocks.begin(), mocks.end(), [this](std::shared_ptr<DbusTestTask> task) {
+					if (dbus_test_task_get_bus(task.get()) == DBUS_TEST_SERVICE_BUS_SYSTEM) {
+						dbus_test_service_add_task(_system_service, task.get());
+					} else {
+						dbus_test_service_add_task(_session_service, task.get());
+					}
+				});
+
+				g_debug("Starting System Bus");
+				dbus_test_service_start_tasks(_system_service);
+				_system = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr);
+				g_dbus_connection_set_exit_on_close(_system, FALSE);
+
+				g_debug("Starting Session Bus");
+				dbus_test_service_start_tasks(_session_service);
+				_session = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
+				g_dbus_connection_set_exit_on_close(_session, FALSE);
+			}
+
+			virtual ~PerRunData (void) {
+				_menu.reset();
+				_actions.reset();
+
+				/* D-Bus Test Stuff */
+				g_clear_object(&_test_dummy);
+				g_clear_object(&_test_indicator);
+				g_clear_object(&_session_service);
+				g_clear_object(&_system_service);
+
+				/* Wait for D-Bus session bus to go */
+				if (!g_dbus_connection_is_closed(_session)) {
+					g_dbus_connection_close_sync(_session, nullptr, nullptr);
+				}
+				g_clear_object(&_session);
+
+				if (!g_dbus_connection_is_closed(_system)) {
+					g_dbus_connection_close_sync(_system, nullptr, nullptr);
+				}
+				g_clear_object(&_system);
+			}
+		};
+
+		std::shared_ptr<PerRunData> run;
+
+	public:
+		virtual ~IndicatorFixture() = default;
+
+		IndicatorFixture (const std::string& path,
+				const std::string& addr)
+			: _indicatorPath(path)
+			, _indicatorAddress(addr)
+		{
+		};
+
+
+	protected:
+		virtual void SetUp() override
+		{
+			run = std::make_shared<PerRunData>(_indicatorPath, _indicatorAddress, _mocks);
+
+			_mocks.clear();
+		}
+
+		virtual void TearDown() override
+		{
+			run.reset();
+		}
+
+		void addMock (std::shared_ptr<DbusTestTask> mock)
+		{
+			_mocks.push_back(mock);
+		}
+
+		std::shared_ptr<DbusTestTask> buildBustleMock (const std::string& filename, DbusTestServiceBus bus = DBUS_TEST_SERVICE_BUS_BOTH)
+		{
+			return std::shared_ptr<DbusTestTask>([filename, bus]() {
+				DbusTestTask * bustle = DBUS_TEST_TASK(dbus_test_bustle_new(filename.c_str()));
+				dbus_test_task_set_name(bustle, "Bustle");
+				dbus_test_task_set_bus(bustle, bus);
+				return bustle;
+			}(), [](DbusTestTask * bustle) {
+				g_clear_object(&bustle);
+			});
+		}
+
+	private:
+		void waitForCore (GObject * obj, const gchar * signalname) {
+			auto loop = g_main_loop_new(nullptr, FALSE);
+
+			/* Our two exit criteria */
+			gulong signal = g_signal_connect_swapped(obj, signalname, G_CALLBACK(g_main_loop_quit), loop);
+			guint timer = g_timeout_add_seconds(5, [](gpointer user_data) -> gboolean {
+					g_warning("Menu Timeout");
+					g_main_loop_quit((GMainLoop *)user_data);
+					return G_SOURCE_CONTINUE;
+				}, loop);
+
+			/* Wait for sync */
+			g_main_loop_run(loop);
+
+			/* Clean up */
+			g_source_remove(timer);
+			g_signal_handler_disconnect(obj, signal);
+
+			g_main_loop_unref(loop);
+		}
+
+		void menuWaitForItems (const std::shared_ptr<GMenuModel>& menu) {
+			auto count = g_menu_model_get_n_items(menu.get());
+			
+			if (count != 0)
+				return;
+
+			waitForCore(G_OBJECT(menu.get()), "items-changed");
+		}
+
+		void agWaitForActions (const std::shared_ptr<GActionGroup>& group) {
+			auto list = std::shared_ptr<gchar *>(
+				g_action_group_list_actions(group.get()),
+				[](gchar ** list) {
+					g_strfreev(list);
+				});
+
+			if (g_strv_length(list.get()) != 0) {
+				return;
+			}
+
+			waitForCore(G_OBJECT(group.get()), "action-added");
+		}
+
+	protected:
+		void setMenu (const std::string& path) {
+			run->_menu.reset();
+
+			g_debug("Getting Menu: %s:%s", _indicatorAddress.c_str(), path.c_str());
+			run->_menu = std::shared_ptr<GMenuModel>(G_MENU_MODEL(g_dbus_menu_model_get(run->_session, _indicatorAddress.c_str(), path.c_str())), [](GMenuModel * modelptr) {
+				g_clear_object(&modelptr);
+			});
+
+			menuWaitForItems(run->_menu);
+		}
+
+		void setActions (const std::string& path) {
+			run->_actions.reset();
+
+			run->_actions = std::shared_ptr<GActionGroup>(G_ACTION_GROUP(g_dbus_action_group_get(run->_session, _indicatorAddress.c_str(), path.c_str())), [](GActionGroup * groupptr) {
+				g_clear_object(&groupptr);
+			});
+
+			agWaitForActions(run->_actions);
+		}
+
+		testing::AssertionResult expectActionExists (const gchar * nameStr, const std::string& name) {
+			bool hasit = g_action_group_has_action(run->_actions.get(), name.c_str());
+
+			if (!hasit) {
+				auto result = testing::AssertionFailure();
+				result <<
+					"    Action: " << nameStr << std::endl <<
+					"  Expected: " << "Exists" << std::endl <<
+					"    Actual: " << "No action found" << std::endl;
+
+				return result;
+			}
+
+			auto result = testing::AssertionSuccess();
+			return result;
+		}
+
+		testing::AssertionResult expectActionStateType (const char * nameStr, const char * typeStr, const std::string& name, const GVariantType * type) {
+			auto atype = g_action_group_get_action_state_type(run->_actions.get(), name.c_str());
+			bool same = false;
+
+			if (atype != nullptr) {
+				same = g_variant_type_equal(atype, type);
+			}
+
+			if (!same) {
+				auto result = testing::AssertionFailure();
+				result <<
+					"    Action: " << nameStr << std::endl <<
+					"  Expected: " << typeStr << std::endl <<
+					"    Actual: " << g_variant_type_peek_string(atype) << std::endl;
+
+				return result;
+			}
+
+			auto result = testing::AssertionSuccess();
+			return result;
+		}
+
+		testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, GVariant * value) {
+			auto varref = std::shared_ptr<GVariant>(g_variant_ref_sink(value), [](GVariant * varptr) {
+				if (varptr != nullptr)
+					g_variant_unref(varptr);
+			});
+			auto aval = std::shared_ptr<GVariant>(g_action_group_get_action_state(run->_actions.get(), name.c_str()), [] (GVariant * varptr) {
+				if (varptr != nullptr)
+					g_variant_unref(varptr);
+			});
+			bool match = false;
+
+			if (aval != nullptr) {
+				match = g_variant_equal(aval.get(), varref.get());
+			}
+
+			if (!match) {
+				gchar * attstr = nullptr;
+
+				if (aval != nullptr) {
+					attstr = g_variant_print(aval.get(), TRUE);
+				} else {
+					attstr = g_strdup("nullptr");
+				}
+
+				auto result = testing::AssertionFailure();
+				result <<
+					"    Action: " << nameStr << std::endl <<
+					"  Expected: " << valueStr << std::endl <<
+					"    Actual: " << attstr << std::endl;
+
+				g_free(attstr);
+
+				return result;
+			} else {
+				auto result = testing::AssertionSuccess();
+				return result;
+			}
+		}
+
+		testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, bool value) {
+			GVariant * var = g_variant_new_boolean(value);
+			return expectActionStateIs(nameStr, valueStr, name, var);
+		}
+
+		testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, std::string value) {
+			GVariant * var = g_variant_new_string(value.c_str());
+			return expectActionStateIs(nameStr, valueStr, name, var);
+		}
+
+		testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, const char * value) {
+			GVariant * var = g_variant_new_string(value);
+			return expectActionStateIs(nameStr, valueStr, name, var);
+		}
+
+		testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, double value) {
+			GVariant * var = g_variant_new_double(value);
+			return expectActionStateIs(nameStr, valueStr, name, var);
+		}
+
+		testing::AssertionResult expectActionStateIs (const char * nameStr, const char * valueStr, const std::string& name, float value) {
+			GVariant * var = g_variant_new_double(value);
+			return expectActionStateIs(nameStr, valueStr, name, var);
+		}
+
+
+	private:
+		std::shared_ptr<GVariant> getMenuAttributeVal (int location, std::shared_ptr<GMenuModel>& menu, const std::string& attribute, std::shared_ptr<GVariant>& value) {
+			if (!(location < g_menu_model_get_n_items(menu.get()))) {
+				return nullptr;
+			}
+
+			if (location >= g_menu_model_get_n_items(menu.get()))
+				return nullptr;
+
+			auto menuval = std::shared_ptr<GVariant>(g_menu_model_get_item_attribute_value(menu.get(), location, attribute.c_str(), g_variant_get_type(value.get())), [](GVariant * varptr) {
+				if (varptr != nullptr)
+					g_variant_unref(varptr);
+			});
+
+			return menuval;
+		}
+
+		std::shared_ptr<GVariant> getMenuAttributeRecurse (std::vector<int>::const_iterator menuLocation, std::vector<int>::const_iterator menuEnd, const std::string& attribute, std::shared_ptr<GVariant>& value, std::shared_ptr<GMenuModel>& menu) {
+			if (menuLocation == menuEnd)
+				return nullptr;
+
+			if (menuLocation + 1 == menuEnd)
+				return getMenuAttributeVal(*menuLocation, menu, attribute, value);
+
+			auto clearfunc = [](GMenuModel * modelptr) {
+				g_clear_object(&modelptr);
+			};
+
+			auto submenu = std::shared_ptr<GMenuModel>(g_menu_model_get_item_link(menu.get(), *menuLocation, G_MENU_LINK_SUBMENU), clearfunc);
+
+			if (submenu == nullptr)
+				submenu = std::shared_ptr<GMenuModel>(g_menu_model_get_item_link(menu.get(), *menuLocation, G_MENU_LINK_SECTION), clearfunc);
+
+			if (submenu == nullptr)
+				return nullptr;
+
+			menuWaitForItems(submenu);
+
+			return getMenuAttributeRecurse(menuLocation + 1, menuEnd, attribute, value, submenu);
+		}
+
+	protected:
+		testing::AssertionResult expectMenuAttribute (const char * menuLocationStr, const gchar * attributeStr, const char * valueStr, const std::vector<int> menuLocation, const std::string& attribute, GVariant * value) {
+			auto varref = std::shared_ptr<GVariant>(g_variant_ref_sink(value), [](GVariant * varptr) {
+				if (varptr != nullptr)
+					g_variant_unref(varptr);
+			});
+
+			auto attrib = getMenuAttributeRecurse(menuLocation.cbegin(), menuLocation.cend(), attribute, varref, run->_menu);
+			bool same = false;
+
+			if (attrib != nullptr && varref != nullptr) {
+				same = g_variant_equal(attrib.get(), varref.get());
+			}
+
+			if (!same) {
+				gchar * attstr = nullptr;
+
+				if (attrib != nullptr) {
+					attstr = g_variant_print(attrib.get(), TRUE);
+				} else {
+					attstr = g_strdup("nullptr");
+				}
+
+				auto result = testing::AssertionFailure();
+				result <<
+					"      Menu: " << menuLocationStr << std::endl <<
+					" Attribute: " << attributeStr << std::endl <<
+					"  Expected: " << valueStr << std::endl <<
+					"    Actual: " << attstr << std::endl;
+
+				g_free(attstr);
+
+				return result;
+			} else {
+				auto result = testing::AssertionSuccess();
+				return result;
+			}
+		}
+
+		testing::AssertionResult expectMenuAttribute (const char * menuLocationStr, const gchar * attributeStr, const char * valueStr, const std::vector<int> menuLocation, const std::string& attribute, bool value) {
+			GVariant * var = g_variant_new_boolean(value);
+			return expectMenuAttribute(menuLocationStr, attributeStr, valueStr, menuLocation, attribute, var);
+		}
+
+		testing::AssertionResult expectMenuAttribute (const char * menuLocationStr, const gchar * attributeStr, const char * valueStr, const std::vector<int> menuLocation, const std::string& attribute, std::string value) {
+			GVariant * var = g_variant_new_string(value.c_str());
+			return expectMenuAttribute(menuLocationStr, attributeStr, valueStr, menuLocation, attribute, var);
+		}
+
+		testing::AssertionResult expectMenuAttribute (const char * menuLocationStr, const gchar * attributeStr, const char * valueStr, const std::vector<int> menuLocation, const std::string& attribute, const char * value) {
+			GVariant * var = g_variant_new_string(value);
+			return expectMenuAttribute(menuLocationStr, attributeStr, valueStr, menuLocation, attribute, var);
+		}
+
+};
+
+#define EXPECT_MENU_ATTRIB(menu, attrib, value) \
+	EXPECT_PRED_FORMAT3(IndicatorFixture::expectMenuAttribute, menu, attrib, value)
+
+#define ASSERT_MENU_ATTRIB(menu, attrib, value) \
+	ASSERT_PRED_FORMAT3(IndicatorFixture::expectMenuAttribute, menu, attrib, value)
+
+#define ASSERT_ACTION_EXISTS(action) \
+	ASSERT_PRED_FORMAT1(IndicatorFixture::expectActionExists, action)
+
+#define EXPECT_ACTION_EXISTS(action) \
+	EXPECT_PRED_FORMAT1(IndicatorFixture::expectActionExists, action)
+
+#define EXPECT_ACTION_STATE(action, value) \
+	EXPECT_PRED_FORMAT2(IndicatorFixture::expectActionStateIs, action, value)
+
+#define ASSERT_ACTION_STATE(action, value) \
+	ASSERT_PRED_FORMAT2(IndicatorFixture::expectActionStateIs, action, value)
+
+#define EXPECT_ACTION_STATE_TYPE(action, type) \
+	EXPECT_PRED_FORMAT2(IndicatorFixture::expectActionStateType, action, type)
+
+#define ASSERT_ACTION_STATE_TYPE(action, type) \
+	ASSERT_PRED_FORMAT2(IndicatorFixture::expectActionStateType, action, type)
+

=== added file 'tests/indicator-test.cc'
--- tests/indicator-test.cc	1970-01-01 00:00:00 +0000
+++ tests/indicator-test.cc	2015-01-30 23:01:09 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+
+#include "indicator-fixture.h"
+#include "accounts-service-mock.h"
+
+class IndicatorTest : public IndicatorFixture
+{
+protected:
+	IndicatorTest (void) :
+		IndicatorFixture(INDICATOR_SOUND_SERVICE_BINARY, "com.canonical.indicator.sound")
+	{
+	}
+
+	std::shared_ptr<AccountsServiceMock> as;
+
+	virtual void SetUp() override
+	{
+		//addMock(buildBustleMock("indicator-test-session.bustle", DBUS_TEST_SERVICE_BUS_SESSION));
+		//addMock(buildBustleMock("indicator-test-system.bustle", DBUS_TEST_SERVICE_BUS_SYSTEM));
+		g_setenv("LD_PRELOAD", PA_MOCK_LIB, TRUE);
+
+		as = std::make_shared<AccountsServiceMock>();
+		addMock(*as);
+
+		IndicatorFixture::SetUp();
+	}
+
+	virtual void TearDown() override
+	{
+		as.reset();
+
+		IndicatorFixture::TearDown();
+	}
+
+};
+
+
+TEST_F(IndicatorTest, PhoneMenu) {
+	setMenu("/com/canonical/indicator/sound/phone");
+
+	EXPECT_MENU_ATTRIB({0}, "action", "indicator.root");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "com.canonical.indicator.root");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-scroll-action", "indicator.scroll");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-secondary-action", "indicator.mute");
+
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.silent-mode");
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Silent Mode");
+
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "action", "indicator.phone-settings");
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 1}), "label", "Sound Settings…");
+}
+
+TEST_F(IndicatorTest, DesktopMenu) {
+	setMenu("/com/canonical/indicator/sound/desktop");
+
+	EXPECT_MENU_ATTRIB({0}, "action", "indicator.root");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-type", "com.canonical.indicator.root");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-scroll-action", "indicator.scroll");
+	EXPECT_MENU_ATTRIB({0}, "x-canonical-secondary-action", "indicator.mute");
+
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "action", "indicator.mute");
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 0, 0}), "label", "Mute");
+
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 2}), "action", "indicator.desktop-settings");
+	EXPECT_MENU_ATTRIB(std::vector<int>({0, 2}), "label", "Sound Settings…");
+}
+
+TEST_F(IndicatorTest, BaseActions) {
+	setActions("/com/canonical/indicator/sound");
+
+	ASSERT_ACTION_EXISTS("root");
+	ASSERT_ACTION_STATE_TYPE("root", G_VARIANT_TYPE("a{sv}"));
+
+	ASSERT_ACTION_EXISTS("scroll");
+
+	ASSERT_ACTION_EXISTS("silent-mode");
+	ASSERT_ACTION_STATE_TYPE("silent-mode", G_VARIANT_TYPE_BOOLEAN);
+	EXPECT_ACTION_STATE("silent-mode", false);
+
+	ASSERT_ACTION_EXISTS("mute");
+	ASSERT_ACTION_STATE_TYPE("mute", G_VARIANT_TYPE_BOOLEAN);
+	EXPECT_ACTION_STATE("mute", false);
+
+	ASSERT_ACTION_EXISTS("mic-volume");
+	ASSERT_ACTION_STATE_TYPE("mic-volume", G_VARIANT_TYPE_DOUBLE);
+
+	ASSERT_ACTION_EXISTS("volume");
+	ASSERT_ACTION_STATE_TYPE("volume", G_VARIANT_TYPE_DOUBLE);
+}
+

=== modified file 'tests/media-player-user.cc'
--- tests/media-player-user.cc	2014-03-25 15:54:57 +0000
+++ tests/media-player-user.cc	2015-01-30 23:01:09 +0000
@@ -34,30 +34,22 @@
 		DbusTestService * service = NULL;
 		AccountsServiceMock service_mock;
 
-		GDBusConnection * session = NULL;
 		GDBusConnection * system = NULL;
 		GDBusProxy * proxy = NULL;
 
 		virtual void SetUp() {
 			service = dbus_test_service_new(NULL);
-
+			dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_SYSTEM);
 
 			dbus_test_service_add_task(service, (DbusTestTask*)service_mock);
 			dbus_test_service_start_tasks(service);
 
-			g_setenv("DBUS_SYSTEM_BUS_ADDRESS", g_getenv("DBUS_SESSION_BUS_ADDRESS"), TRUE);
-
-			session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-			ASSERT_NE(nullptr, session);
-			g_dbus_connection_set_exit_on_close(session, FALSE);
-			g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session);
-
 			system = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
 			ASSERT_NE(nullptr, system);
 			g_dbus_connection_set_exit_on_close(system, FALSE);
 			g_object_add_weak_pointer(G_OBJECT(system), (gpointer *)&system);
 
-			proxy = g_dbus_proxy_new_sync(session,
+			proxy = g_dbus_proxy_new_sync(system,
 				G_DBUS_PROXY_FLAGS_NONE,
 				NULL,
 				"org.freedesktop.Accounts",
@@ -71,7 +63,6 @@
 			g_clear_object(&proxy);
 			g_clear_object(&service);
 
-			g_object_unref(session);
 			g_object_unref(system);
 
 			#if 0
@@ -189,6 +180,9 @@
 	set_property("Album", g_variant_new_string("Vinyl is dead"));
 	set_property("ArtUrl", g_variant_new_string("http://art.url"));
 
+	/* Ensure the properties get set before we pull them */
+	loop(100);
+
 	/* Build our media player */
 	MediaPlayerUser * player = media_player_user_new("user");
 	ASSERT_NE(nullptr, player);

=== modified file 'tests/pa-mock.cpp'
--- tests/pa-mock.cpp	2015-01-29 14:34:50 +0000
+++ tests/pa-mock.cpp	2015-01-30 23:01:09 +0000
@@ -23,6 +23,7 @@
 
 #include <pulse/pulseaudio.h>
 #include <pulse/glib-mainloop.h>
+#include <pulse/ext-stream-restore.h>
 #include <gio/gio.h>
 #include <math.h>
 
@@ -280,6 +281,12 @@
 	return dummy_operation();
 }
 
+pa_operation *
+pa_context_get_sink_input_info_list (pa_context *c, pa_sink_input_info_cb_t cb, void * userdata)
+{
+	return pa_context_get_sink_input_info (c, 0, cb, userdata);
+}
+
 pa_operation*
 pa_context_get_source_info_by_name (pa_context *c, const char * name, pa_source_info_cb_t cb, void *userdata)
 {
@@ -569,3 +576,18 @@
 	return cvol;
 }
 
+/* *******************************
+ * ext-stream-restore.h
+ * *******************************/
+
+pa_operation *
+pa_ext_stream_restore_test (pa_context * c, pa_ext_stream_restore_test_cb_t callback, void * userdata)
+{
+	reinterpret_cast<PAMockContext*>(c)->idleOnce(
+	[c, callback, userdata]() {
+		if (callback != nullptr)
+			callback(c, 1, userdata);
+	});
+
+	return dummy_operation();
+}

=== modified file 'tests/volume-control-test.cc'
--- tests/volume-control-test.cc	2015-01-27 17:42:26 +0000
+++ tests/volume-control-test.cc	2015-01-30 23:01:09 +0000
@@ -23,6 +23,7 @@
 
 extern "C" {
 #include "indicator-sound-service.h"
+#include "vala-mocks.h"
 }
 
 class VolumeControlTest : public ::testing::Test
@@ -71,7 +72,8 @@
 };
 
 TEST_F(VolumeControlTest, BasicObject) {
-	VolumeControl * control = volume_control_new();
+	FocusTrackerMock * focustracker = focus_tracker_mock_new();
+	VolumeControl * control = volume_control_new(FOCUS_TRACKER(focustracker));
 
 	/* Setup the PA backend */
 	loop(100);

=== added file 'vapi/libpulse-ext-stream-restore.vapi'
--- vapi/libpulse-ext-stream-restore.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libpulse-ext-stream-restore.vapi	2015-01-30 23:01:09 +0000
@@ -0,0 +1,22 @@
+
+using GLib;
+using PulseAudio;
+
+[CCode (cheader_filename="pulse/ext-stream-restore.h")]
+namespace PulseAudio.Extension.StreamRestore {
+	public struct Info {
+		string name;
+		PulseAudio.ChannelMap channel_map;
+		PulseAudio.CVolume volume;
+		string device;
+		int mute;
+	}
+
+	public delegate void TestCb (PulseAudio.Context context, uint32 version);
+	[CCode (cname="pa_ext_stream_restore_test")]
+	PulseAudio.Operation? test (PulseAudio.Context context, TestCb? callback = null);
+
+	public delegate void ReadCb (PulseAudio.Context context, PulseAudio.Extension.StreamRestore.Info[] streams, int eol);
+	[CCode (cname="pa_ext_stream_restore_read")]
+	PulseAudio.Operation? read (PulseAudio.Context context, ReadCb? callback = null);
+}