tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed onConnectionLost from DeviceLinkProvider

Browse source 
(Connect to destroyed on DeviceLink instead)
Also, registering Device in dbus too soon fixed
This commit is contained in:
Albert Vaca 2013-08-16 06:26:40 +02:00
parent 986c49d326
commit 907740196a
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
daemon/device.cpp
View file

@ -23,10 +23,11 @@ Device::Device(const QString& id, const QString& name)
m_paired = true;
m_knownIdentiy = true;
//Register in bus
QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors | QDBusConnection::ExportChildObjects);
reloadPlugins();
//Register in bus
QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
}
Device::Device(const QString& id, const QString& name, DeviceLink* link)
@ -36,12 +37,13 @@ Device::Device(const QString& id, const QString& name, DeviceLink* link)
m_paired = false;
m_knownIdentiy = true;
//Register in bus
QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors | QDBusConnection::ExportChildObjects);
addLink(link);
reloadPlugins();
//Register in bus
QDBusConnection::sessionBus().registerObject("/modules/kdeconnect/devices/"+id, this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
}
/*
Device::Device(const QString& id, const QString& name, DeviceLink* link)
@ -137,7 +139,8 @@ void Device::addLink(DeviceLink* link)
{
qDebug() << "Adding link to" << id() << "via" << link->provider();
connect(link,SIGNAL(destroyed(QObject*)),this,SLOT(linkDestroyed(QObject*)));
connect(link, SIGNAL(destroyed(QObject*)),
this, SLOT(linkDestroyed(QObject*)));
m_deviceLinks.append(link);
@ -165,7 +168,7 @@ void Device::removeLink(DeviceLink* link)
{
m_deviceLinks.removeOne(link);
qDebug() << "RemoveLink"<< m_deviceLinks.size() << "links remaining";
qDebug() << "RemoveLink" << m_deviceLinks.size() << "links remaining";
if (m_deviceLinks.empty()) {
reloadPlugins();

4
daemon/device.h
View file

@ -80,8 +80,8 @@ private Q_SLOTS:
void privateReceivedPackage(const NetworkPackage& np);
Q_SIGNALS:
void reachableStatusChanged();
void pluginsChanged();
Q_SCRIPTABLE void reachableStatusChanged();
Q_SCRIPTABLE void pluginsChanged();
private:
bool m_paired;

2
daemon/linkproviders/linkprovider.h
View file

@ -54,8 +54,8 @@ public Q_SLOTS:
Q_SIGNALS:
//NOTE: The provider will to destroy the DeviceLink when it's no longer accessible,
// and every user should listen to the destroyed signal to remove its references.
// That's the reason because there is no "onConnectionLost".
void onConnectionReceived(const NetworkPackage& identityPackage, DeviceLink*);
void onConnectionLost(DeviceLink*);
};

4
daemon/linkproviders/loopbacklinkprovider.cpp
View file

@ -26,7 +26,6 @@
LoopbackLinkProvider::LoopbackLinkProvider()
: identityPackage(PACKAGE_TYPE_IDENTITY)
{
echoDeviceLink = new EchoDeviceLink("loopback", this);
NetworkPackage::createIdentityPackage(&identityPackage);
}
@ -44,11 +43,12 @@ void LoopbackLinkProvider::onNetworkChange(QNetworkSession::State state)
void LoopbackLinkProvider::onStart()
{
echoDeviceLink = new EchoDeviceLink("loopback", this);
onNetworkChange(QNetworkSession::Connected);
}
void LoopbackLinkProvider::onStop()
{
onConnectionLost(echoDeviceLink);
delete echoDeviceLink;
}