Merge lp:~jbicha/indicator-sound/build-with-vala36 into lp:indicator-sound

Proposed by Jeremy Bícha
Status: Merged
Approved by: Robert Ancell
Approved revision: 556
Merged at revision: 556
Proposed branch: lp:~jbicha/indicator-sound/build-with-vala36
Merge into: lp:indicator-sound
Diff against target: 25 lines (+2/-2)
2 files modified
src/media-player-mpris.vala (+1/-1)
src/volume-control-pulse.vala (+1/-1)
To merge this branch: bzr merge lp:~jbicha/indicator-sound/build-with-vala36
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+325859@code.launchpad.net

Commit message

[Rico Tzschichholz]
Fix build with vala 0.36

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/media-player-mpris.vala'
--- src/media-player-mpris.vala 2015-12-31 20:49:42 +0000
+++ src/media-player-mpris.vala 2017-06-16 17:40:44 +0000
@@ -66,7 +66,7 @@
66 }66 }
6767
68 public override string state {68 public override string state {
69 get; private set; default = "Paused";69 get; set; default = "Paused";
70 }70 }
7171
72 public override MediaPlayer.Track? current_track {72 public override MediaPlayer.Track? current_track {
7373
=== modified file 'src/volume-control-pulse.vala'
--- src/volume-control-pulse.vala 2016-03-04 15:25:39 +0000
+++ src/volume-control-pulse.vala 2017-06-16 17:40:44 +0000
@@ -58,7 +58,7 @@
58 private bool _source_sink_mic_activated = false;58 private bool _source_sink_mic_activated = false;
5959
60 /** true when a microphone is active **/60 /** true when a microphone is active **/
61 public override bool active_mic { get; private set; default = false; }61 public override bool active_mic { get; set; default = false; }
6262
63 public VolumeControlPulse (IndicatorSound.Options options, PulseAudio.GLibMainLoop loop, AccountsServiceAccess? accounts_service_access)63 public VolumeControlPulse (IndicatorSound.Options options, PulseAudio.GLibMainLoop loop, AccountsServiceAccess? accounts_service_access)
64 {64 {

Subscribers

People subscribed via source and target branches