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

Proposed by Jeremy Bicha on 2017-06-16
Status: Merged
Approved by: Robert Ancell on 2017-06-18
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 2017-06-16 Approve on 2017-06-18
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.
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
1=== modified file 'src/media-player-mpris.vala'
2--- src/media-player-mpris.vala 2015-12-31 20:49:42 +0000
3+++ src/media-player-mpris.vala 2017-06-16 17:40:44 +0000
4@@ -66,7 +66,7 @@
5 }
6
7 public override string state {
8- get; private set; default = "Paused";
9+ get; set; default = "Paused";
10 }
11
12 public override MediaPlayer.Track? current_track {
13
14=== modified file 'src/volume-control-pulse.vala'
15--- src/volume-control-pulse.vala 2016-03-04 15:25:39 +0000
16+++ src/volume-control-pulse.vala 2017-06-16 17:40:44 +0000
17@@ -58,7 +58,7 @@
18 private bool _source_sink_mic_activated = false;
19
20 /** true when a microphone is active **/
21- public override bool active_mic { get; private set; default = false; }
22+ public override bool active_mic { get; set; default = false; }
23
24 public VolumeControlPulse (IndicatorSound.Options options, PulseAudio.GLibMainLoop loop, AccountsServiceAccess? accounts_service_access)
25 {

Subscribers

People subscribed via source and target branches