Merge lp:~elementary-pantheon/switchboard-plug-applications/prefs-spec into lp:~elementary-pantheon/switchboard-plug-applications/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: Corentin Noël
Approved revision: 194
Merged at revision: 194
Proposed branch: lp:~elementary-pantheon/switchboard-plug-applications/prefs-spec
Merge into: lp:~elementary-pantheon/switchboard-plug-applications/trunk
Diff against target: 22 lines (+6/-2)
1 file modified
src/Plug.vala (+6/-2)
To merge this branch: bzr merge lp:~elementary-pantheon/switchboard-plug-applications/prefs-spec
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+313174@code.launchpad.net

Commit message

Implement Preferences URL spec

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Plug.vala'
2--- src/Plug.vala 2016-10-24 17:23:12 +0000
3+++ src/Plug.vala 2016-12-13 19:42:07 +0000
4@@ -31,12 +31,16 @@
5 private Gtk.Stack stack;
6
7 public ApplicationsPlug () {
8+ var settings = new Gee.TreeMap<string, string?> (null, null);
9+ settings.set ("applications", "null");
10+ settings.set ("applications/defaults", DEFAULTS);
11+ settings.set ("applications/startup", STARTUP);
12 Object (category: Category.PERSONAL,
13 code_name: "personal-pantheon-applications",
14 display_name: _("Applications"),
15 description: _("Manage default and startup applications"),
16- icon: "preferences-desktop-applications");
17-
18+ icon: "preferences-desktop-applications",
19+ supported_settings: settings);
20 defaults_plug = new Defaults.Plug ();
21 startup_plug = new Startup.Plug ();
22 }

Subscribers

People subscribed via source and target branches