Merge lp:~ted/indicator-sound/revert-notifications into lp:indicator-sound/14.10

[Ted Gould]

Revert notifications on volume change.

Reverting notifications so other things can land while it gets fixed.

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2014-10-07 02:40:45 +0000
+++ src/volume-control.vala	2014-10-08 18:34:46 +0000
@@ -19,7 +19,6 @@
  */
 
 using PulseAudio;
-using Notify;
 using Gee;
 
 [CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")]
@@ -68,7 +67,6 @@
 	private uint _accountservice_volume_timer = 0;
 	private bool _send_next_local_volume = false;
 	private double _account_service_volume = 0.0;
-	private Notify.Notification _notification;
 
 	public signal void volume_changed (double v);
 	public signal void mic_volume_changed (double v);
@@ -86,13 +84,6 @@
 
 		_mute_cancellable = new Cancellable ();
 		_volume_cancellable = new Cancellable ();
-
-		Notify.init ("Volume");
-		_notification = new Notify.Notification("Volume", "", "audio-volume-muted");
-		_notification.set_hint ("value", 0);
-		_notification.set_hint ("x-canonical-private-synchronous", "true");
-		_notification.set_hint ("x-canonical-non-shaped-icon", "true");
-
 		setup_accountsservice.begin ();
 
 		this.reconnect_to_pulse ();
@@ -577,21 +568,8 @@
 
 	public void set_volume (double volume)
 	{
-		if (_volume == 0.0)
-			_notification.update ("Volume", "", "audio-volume-muted");
-		if (_volume > 0.0 && _volume <= 0.33)
-			_notification.update ("Volume", "", "audio-volume-low");
-		if (_volume > 0.33 && _volume <= 0.66)
-			_notification.update ("Volume", "", "audio-volume-medium");
-		if (_volume > 0.66 && _volume <= 1.0)
-			_notification.update ("Volume", "", "audio-volume-high");
-		_notification.set_hint ("value", _volume * 100.0);
-		_notification.set_hint ("sound-file", "/usr/share/sounds/ubuntu/stereo/message.ogg");
-		_notification.show ();			
-
-		if (set_volume_internal (volume)) {
+		if (set_volume_internal (volume))
 			start_local_volume_timer();
-		}
 	}
 
 	void set_mic_volume_success_cb (Context c, int success)