Merge lp:~codygarver/wingpanel-indicator-power/fix-1575376 into lp:~wingpanel-devs/wingpanel-indicator-power/trunk

Proposed by Cody Garver
Status: Merged
Approved by: Corentin Noël
Approved revision: 181
Merged at revision: 181
Proposed branch: lp:~codygarver/wingpanel-indicator-power/fix-1575376
Merge into: lp:~wingpanel-devs/wingpanel-indicator-power/trunk
Diff against target: 29 lines (+8/-4)
1 file modified
src/Widgets/PopoverWidget.vala (+8/-4)
To merge this branch: bzr merge lp:~codygarver/wingpanel-indicator-power/fix-1575376
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+309644@code.launchpad.net

Commit message

Use GLib.AppInfo.launch instead of Granite SimpleComand (lp:1575376)

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/Widgets/PopoverWidget.vala'
2--- src/Widgets/PopoverWidget.vala 2016-02-10 04:14:55 +0000
3+++ src/Widgets/PopoverWidget.vala 2016-10-30 21:43:20 +0000
4@@ -20,8 +20,6 @@
5 public class Power.Widgets.PopoverWidget : Gtk.Box {
6 private bool is_in_session = false;
7
8- private const string SETTINGS_EXEC = "/usr/bin/switchboard power";
9-
10 private DeviceList device_list;
11 private AppList app_list;
12
13@@ -72,8 +70,14 @@
14 }
15
16 private void show_settings () {
17- var cmd = new Granite.Services.SimpleCommand ("/usr/bin", SETTINGS_EXEC);
18- cmd.run ();
19+ var list = new List<string> ();
20+ list.append ("power");
21+ try {
22+ var appinfo = AppInfo.create_from_commandline ("switchboard", null, AppInfoCreateFlags.SUPPORTS_URIS);
23+ appinfo.launch_uris (list, null);
24+ } catch (Error e) {
25+ warning ("%s\n", e.message);
26+ }
27
28 settings_shown ();
29 }

Subscribers

People subscribed via source and target branches

to all changes: