Remove Agent

Author: danirabbit

po/POTFILES

@@ -1,6 +1,5 @@
 src/Plug.vala
 src/MainView.vala
-src/PairDialog.vala
 src/DeviceRow.vala
 src/Services/Manager.vala
 src/Services/Device.vala

src/PairDialog.vala

@@ -62,13 +62,11 @@ public class Bluetooth.Plug : Switchboard.Plug {
     }
 
     public override void shown () {
-        manager.register_agent.begin (main_view.get_root () as Gtk.Window);
         manager.set_global_state.begin (true); /* Also sets discoverable true and starts discovery */
     }
 
     public override void hidden () {
         Application.get_default ().hold ();
-        manager.unregister_agent.begin ();
         manager.discoverable = false; /* Does not change is_powered or connections*/
         manager.stop_discovery.begin (() => {
             Application.get_default ().release ();

src/Plug.vala

@@ -18,13 +18,6 @@
  * Authored by: Corentin Noël <[email protected]>
  */
 
-[DBus (name = "org.bluez.AgentManager1")]
-public interface Bluetooth.Services.AgentManager : Object {
-    public abstract void register_agent (ObjectPath agent, string capability) throws Error;
-    public abstract void request_default_agent (ObjectPath agent) throws Error;
-    public abstract void unregister_agent (ObjectPath agent) throws Error;
-}
-
 public class Bluetooth.Services.ObjectManager : Object {
     private const string SCHEMA = "io.elementary.desktop.wingpanel.bluetooth";
     public signal void adapter_added (Bluetooth.Services.Adapter adapter);
@@ -40,12 +33,8 @@ public class Bluetooth.Services.ObjectManager : Object {
     public bool is_powered {get; private set; default = false; }
     public bool is_connected {get; private set; default = false; }
 
-    private bool is_registered = false;
-
     private Settings? settings = null;
     private GLib.DBusObjectManagerClient object_manager;
-    private Bluetooth.Services.AgentManager agent_manager;
-    private Bluetooth.Services.Agent agent;
 
     construct {
         var settings_schema = SettingsSchemaSource.get_default ().lookup (SCHEMA, true);
@@ -239,54 +228,6 @@ public class Bluetooth.Services.ObjectManager : Object {
         return null;
     }
 
-    private async void create_agent (Gtk.Window? window) {
-        if (object_manager == null) {
-            return;
-        }
-        GLib.DBusObject? bluez_object = object_manager.get_object ("/org/bluez");
-        if (bluez_object != null) {
-            agent_manager = (Bluetooth.Services.AgentManager) bluez_object.get_interface ("org.bluez.AgentManager1");
-        }
-
-        agent = new Bluetooth.Services.Agent (window);
-        agent.notify["ready"].connect (() => {
-            if (is_registered) {
-                register_agent.begin (window);
-            }
-        });
-
-        agent.unregistered.connect (() => {
-            is_registered = false;
-        });
-    }
-
-    public async void register_agent (Gtk.Window? window) {
-        is_registered = true;
-        if (agent_manager == null) {
-            yield create_agent (window);
-        }
-
-        if (agent_manager != null && agent.ready) {
-            try {
-                agent_manager.register_agent (agent.get_path (), "DisplayYesNo");
-                agent_manager.request_default_agent (agent.get_path ());
-            } catch (Error e) {
-                critical (e.message);
-            }
-        }
-    }
-
-    public async void unregister_agent () {
-        is_registered = false;
-        if (agent_manager != null && agent.ready) {
-            try {
-                agent_manager.unregister_agent (agent.get_path ());
-            } catch (Error e) {
-                critical (e.message);
-            }
-        }
-    }
-
     public void check_global_state () {
         /* As this is called within a signal handler and emits a signal
          * it should be in a Idle loop  else races occur */