Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/fix-build-error into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: David Hewitt
Approved revision: 307
Merged at revision: 307
Proposed branch: lp:~elementary-pantheon/switchboard-plug-security-privacy/fix-build-error
Merge into: lp:~elementary-apps/switchboard-plug-security-privacy/trunk
Diff against target: 19 lines (+2/-3)
1 file modified
src/Views/TrackPanel.vala (+2/-3)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-security-privacy/fix-build-error
Reviewer Review Type Date Requested Status
David Hewitt code, function Approve
Review via email: mp+318510@code.launchpad.net

Commit message

TrackPanel.vala:
* Fix build error with newer Vala
* Don't double space every sentence

To post a comment you must log in.
Revision history for this message
David Hewitt (davidmhewitt) wrote :

LGTM :)

review: Approve (code, function)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Views/TrackPanel.vala'
2--- src/Views/TrackPanel.vala 2017-02-27 23:08:40 +0000
3+++ src/Views/TrackPanel.vala 2017-02-28 17:10:36 +0000
4@@ -31,13 +31,12 @@
5 }
6
7 construct {
8- var title = _("History Is Disabled").printf (get_operating_system_name ());
9- var description = ("%s\n\n%s\n\n%s".printf (
10+ var description = ("%s %s\n\n%s".printf (
11 _("%s won't retain any further data or statistics about file and application usage.").printf (get_operating_system_name ()),
12 _("The additional functionality that this data provides will be affected."),
13 _("This will not prevent apps from recording their own usage data like browser history.")));
14
15- var alert = new Granite.Widgets.AlertView (title, description, "");
16+ var alert = new Granite.Widgets.AlertView (_("History Is Disabled"), description, "");
17 alert.show_all ();
18
19 var description_frame = new Gtk.Frame (null);

Subscribers

People subscribed via source and target branches