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

[Danielle Foré]

Implement Preferences URL Specification

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-06-10 20:45:20 +0000
+++ src/Plug.vala	2016-12-14 20:04:20 +0000
@@ -26,11 +26,14 @@
     private Gtk.LinkButton link_button;
 
     public Plug () {
+        var settings = new Gee.TreeMap<string, string?> (null, null);
+        settings.set ("network/share", "null");
         Object (category : Category.NETWORK,
                 code_name: "pantheon-sharing",
                 display_name: _("Sharing"),
                 description: _("Configure file and media sharing"),
-                icon: "preferences-system-sharing");
+                icon: "preferences-system-sharing",
+                supported_settings: settings);
     }
 
     public override Gtk.Widget get_widget () {

=== modified file 'src/Widgets/BluetoothPage.vala'
--- src/Widgets/BluetoothPage.vala	2016-05-06 22:58:18 +0000
+++ src/Widgets/BluetoothPage.vala	2016-12-14 20:04:20 +0000
@@ -37,20 +37,6 @@
         sharing_settings.bind ("bluetooth-accept-files", accept_combo, "active-id", SettingsBindFlags.DEFAULT);
         sharing_settings.bind ("bluetooth-notify", notify_switch, "active", SettingsBindFlags.DEFAULT);
 
-        link_button.activate_link.connect (() => {
-            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 (e.message);
-            }
-
-            return true;
-        });
-
         service_switch.notify ["active"].connect (() => {
             set_service_state ();
         });
@@ -89,6 +75,7 @@
 
         link_button.label = _("Bluetooth settings…");
         link_button.tooltip_text = _("Open bluetooth settings");
+        link_button.uri = "settings://network/bluetooth";
         link_button.no_show_all = false;
     }