~jonas-drange/ubuntu-system-settings/apn-entry-independent-of-powered-rtm

« back to all changes in this revision

Viewing changes to plugins/bluetooth/bluetooth.cpp

  • Committer: CI Train Bot
  • Author(s): Ricardo Salveti de Araujo
  • Date: 2015-02-27 06:00:35 UTC
  • mfrom: (997.1.1 rtm-14.09)
  • Revision ID: ci-train-bot@canonical.com-20150227060035-ovclbgn4s0w5uf20
Make an adapter-wide agent available for pairing requests initiated from a remote device. (LP: #1366061) Fixes: #1366061

Show diffs side-by-side

added added

removed removed

Lines of Context:
39
39
{
40
40
    // export our Agent to handle pairing requests
41
41
    new AgentAdaptor(&m_agent);
42
 
    if(!m_dbus.registerObject(DBUS_AGENT_PATH, &m_agent))
43
 
        qCritical() << "Couldn't register agent at" << DBUS_AGENT_PATH;
 
42
    if(!m_dbus.registerObject(DBUS_ADAPTER_AGENT_PATH, &m_agent))
 
43
        qCritical() << "Couldn't register agent at" << DBUS_ADAPTER_AGENT_PATH;
44
44
 
45
45
    m_connectedDevices.filterOnConnections(Device::Connection::Connected |
46
46
                                           Device::Connection::Connecting |
202
202
        device->connect(connMode);
203
203
    } else {
204
204
        m_devices.addConnectAfterPairing(address, connMode);
205
 
        m_devices.createDevice(address);
 
205
        m_devices.createDevice(address, &m_agent);
206
206
    }
207
207
}
208
208