aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2015-12-29 10:09:47 -0600
committercharles kerr <charlesk@canonical.com>2015-12-29 10:09:47 -0600
commit6b5cbcfe81a660cedcc3b905d5c6ccb29184fc35 (patch)
tree17177df8dad26c22be35f20de12cf98e709733a0 /src
parent6afbde41e01d0b01748f9623668158ccd8b51486 (diff)
downloadayatana-indicator-sound-6b5cbcfe81a660cedcc3b905d5c6ccb29184fc35.tar.gz
ayatana-indicator-sound-6b5cbcfe81a660cedcc3b905d5c6ccb29184fc35.tar.bz2
ayatana-indicator-sound-6b5cbcfe81a660cedcc3b905d5c6ccb29184fc35.zip
use G_SOURCE_REMOVE instead of false
Diffstat (limited to 'src')
-rw-r--r--src/service.vala7
-rw-r--r--src/volume-control-pulse.vala6
-rw-r--r--src/volume-warning.vala4
3 files changed, 5 insertions, 12 deletions
diff --git a/src/service.vala b/src/service.vala
index 71d5b4c..40f49b5 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -42,13 +42,6 @@ public class IndicatorSound.Service: Object {
this.notify["visible"].connect ( () => this.update_root_icon () );
this.volume_control = volume;
-#if 0
- this.volume_control.notify["active-stream"].connect(() => {
- var b = VolumeControl.Stream.MULTIMEDIA == volume_control.active_stream;
- message("updating _volume_warning.multimedia_active to %d", (int)b);
- _volume_warning.multimedia_active = b;
- });
-#endif
this.volume_control.active_output_changed.connect(() => {
bool headphones;
switch(volume_control.active_output) {
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala
index 661e71b..6d777c4 100644
--- a/src/volume-control-pulse.vala
+++ b/src/volume-control-pulse.vala
@@ -488,7 +488,7 @@ public class VolumeControlPulse : VolumeControl
{
_reconnect_timer = 0;
reconnect_to_pulse ();
- return false; // G_SOURCE_REMOVE
+ return Source.REMOVE;
}
void reconnect_to_pulse ()
@@ -939,7 +939,7 @@ public class VolumeControlPulse : VolumeControl
_send_next_local_volume = false;
start_local_volume_timer ();
}
- return false; // G_SOURCE_REMOVE
+ return Source.REMOVE;
}
private void start_account_service_volume_timer()
@@ -972,6 +972,6 @@ public class VolumeControlPulse : VolumeControl
{
_accountservice_volume_timer = 0;
start_account_service_volume_timer ();
- return false; // G_SOURCE_REMOVE
+ return Source.REMOVE;
}
}
diff --git a/src/volume-warning.vala b/src/volume-warning.vala
index 0f06f07..d755c17 100644
--- a/src/volume-warning.vala
+++ b/src/volume-warning.vala
@@ -218,7 +218,7 @@ public class VolumeWarning : Object
{
_pulse_reconnect_timer = 0;
pulse_reconnect ();
- return false; // G_SOURCE_REMOVE
+ return Source.REMOVE;
}
void pulse_reconnect ()
@@ -351,7 +351,7 @@ public class VolumeWarning : Object
private bool on_high_volume_approved_timer() {
_high_volume_approved_timer = 0;
update_high_volume_approved();
- return false; /* Source.REMOVE */
+ return Source.REMOVE;
}
private void update_high_volume_approved() {
var new_high_volume_approved = calculate_high_volume_approved();