From 08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Nov 2014 10:48:22 -0600 Subject: Missed part of a merge --- src/volume-control.vala | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src') 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; -- cgit v1.2.3