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
=== modified file 'src/Views/TrackPanel.vala'
--- src/Views/TrackPanel.vala 2017-02-27 23:08:40 +0000
+++ src/Views/TrackPanel.vala 2017-02-28 17:10:36 +0000
@@ -31,13 +31,12 @@
31 }31 }
3232
33 construct {33 construct {
34 var title = _("History Is Disabled").printf (get_operating_system_name ());34 var description = ("%s %s\n\n%s".printf (
35 var description = ("%s\n\n%s\n\n%s".printf (
36 _("%s won't retain any further data or statistics about file and application usage.").printf (get_operating_system_name ()),35 _("%s won't retain any further data or statistics about file and application usage.").printf (get_operating_system_name ()),
37 _("The additional functionality that this data provides will be affected."),36 _("The additional functionality that this data provides will be affected."),
38 _("This will not prevent apps from recording their own usage data like browser history.")));37 _("This will not prevent apps from recording their own usage data like browser history.")));
3938
40 var alert = new Granite.Widgets.AlertView (title, description, "");39 var alert = new Granite.Widgets.AlertView (_("History Is Disabled"), description, "");
41 alert.show_all ();40 alert.show_all ();
4241
43 var description_frame = new Gtk.Frame (null);42 var description_frame = new Gtk.Frame (null);

Subscribers

People subscribed via source and target branches