Merge lp:~donadigo/wingpanel-indicator-bluetooth/use-appinfo into lp:~wingpanel-devs/wingpanel-indicator-bluetooth/trunk

[Adam Bieńkowski]

* Fix bug #1575376: "Use GLib.AppInfo.launch instead of granite simple command to open system settings".

Fixes bug #1575376: "Use GLib.AppInfo.launch instead of granite simple command to open system settings".

Use AppInfo instead of SimpleCommand to launch Switchboard.

[lp:~donadigo/wingpanel-indicator-bluetooth/use-appinfo]

36. By Adam Bieńkowski on 2016-05-04

Remove unused variable; use appinfo for bluetooth wizard

=== modified file 'src/Widgets/Views/MainView.vala'
--- src/Widgets/Views/MainView.vala	2016-05-01 00:07:29 +0000
+++ src/Widgets/Views/MainView.vala	2016-05-04 14:44:43 +0000
@@ -20,8 +20,6 @@
     public signal void device_requested (Bluetooth.Services.Device device);
     public signal void discovery_requested ();
 
-    private const string SETTINGS_EXEC = "switchboard bluetooth";
-
     private Wingpanel.Widgets.Button show_settings_button;
     private Wingpanel.Widgets.Button discovery_button;
     private Wingpanel.Widgets.Switch main_switch;
@@ -59,8 +57,13 @@
 
         discovery_button.clicked.connect (() => {
             request_close ();
-            var cmd = new Granite.Services.SimpleCommand ("/usr/bin", "bluetooth-wizard");
-            cmd.run ();
+
+            try {
+                var appinfo = AppInfo.create_from_commandline ("bluetooth-wizard", null, AppInfoCreateFlags.SUPPORTS_URIS);
+                appinfo.launch_uris (null, null);
+            } catch (Error e) {
+                warning ("%s\n", e.message);
+            }
         });
 
         //Adapter's Connections
@@ -110,7 +113,14 @@
     }
 
     private void show_settings () {
-        var cmd = new Granite.Services.SimpleCommand ("/usr/bin", SETTINGS_EXEC);
-        cmd.run ();
+        var list = new List<string> ();
+        list.append ("bluetooth");
+
+        try {
+            var appinfo = AppInfo.create_from_commandline ("switchboard", null, AppInfoCreateFlags.SUPPORTS_URIS);
+            appinfo.launch_uris (list, null);
+        } catch (Error e) {
+            warning ("%s\n", e.message);
+        }
     }
 }