aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-11-05 10:48:22 -0600
committerTed Gould <ted@gould.cx>2014-11-05 10:48:22 -0600
commit08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d (patch)
tree05f4c79c23bff1fd757a06592f1d71e16c6a4994 /src
parente03e82a36d5662c80ad61c6758591ae40d551f6b (diff)
downloadayatana-indicator-sound-08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d.tar.gz
ayatana-indicator-sound-08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d.tar.bz2
ayatana-indicator-sound-08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d.zip
Missed part of a merge
Diffstat (limited to 'src')
-rw-r--r--src/volume-control.vala10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/volume-control.vala b/src/volume-control.vala
index 295ebf5..6f22dc5 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -604,16 +604,6 @@ public class VolumeControl : Object
{
/* Using this to detect whether we're on the phone or not */
if (_pulse_use_stream_restore) {
-<<<<<<< TREE
- 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");
-=======
/* Watch for extreme */
if (volume > 0.75 && _active_port_headphone)
high_volume = true;