Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:qtsystems.spec
@@ -1,6 +1,6 @@ Name: qt5-qtsystems Summary: Qt System modules -Version: 5.1.0+git9+upower.backport.38.6.gcc4fbf5 +Version: 5.1.0+git9+upower.backport.38.6.g3464618 Release: 1%{?dist} Group: System/Libraries License: LGPLv2.1 with exception or GPLv3
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="tar_git"> <param name="url">https://github.com/mer-packages/qtsystems.git</param> <param name="branch">upower-backport</param> - <param name="revision">HEAD</param> + <param name="revision">HEAD</param> </service> </services> \ No newline at end of file
[-] [+]	Changed	_service:tar_git:qt5-qtsystems-5.1.0+git9+upower.backport.38.6.g3464618.tar.bz2/qtsystems/src/systeminfo/linux/qdevicekitservice_linux.cpp ^
@@ -72,18 +72,9 @@ void QUPowerInterface::connectNotify(const QMetaMethod &signal) { - static const QMetaMethod changedSignal = QMetaMethod::fromSignal(&QUPowerInterface::changed); static const QMetaMethod addedSignal = QMetaMethod::fromSignal(&QUPowerInterface::deviceAdded); static const QMetaMethod removedSignal = QMetaMethod::fromSignal(&QUPowerInterface::deviceRemoved); - if (signal == changedSignal) { - if (!connection().connect(QStringLiteral(UPOWER_SERVICE), - QStringLiteral(UPOWER_PATH), - QStringLiteral(UPOWER_SERVICE), - QStringLiteral("Changed"), - this, SIGNAL(changed()))) { - qDebug() << "Error"<<connection().lastError().message(); - } - } + if (signal == addedSignal) { if (!connection().connect(QStringLiteral(UPOWER_SERVICE), QStringLiteral(UPOWER_PATH), @@ -107,18 +98,9 @@ void QUPowerInterface::disconnectNotify(const QMetaMethod &signal) { - static const QMetaMethod changedSignal = QMetaMethod::fromSignal(&QUPowerInterface::changed); static const QMetaMethod addedSignal = QMetaMethod::fromSignal(&QUPowerInterface::deviceAdded); static const QMetaMethod removedSignal = QMetaMethod::fromSignal(&QUPowerInterface::deviceRemoved); - if (signal == changedSignal) { - if (!connection().disconnect(QStringLiteral(UPOWER_SERVICE), - QStringLiteral(UPOWER_PATH), - QStringLiteral(UPOWER_SERVICE), - QStringLiteral("Changed"), - this, SIGNAL(changed()))) { - qDebug() << "Error"<<connection().lastError().message(); - } - } + if (signal == addedSignal) { if (!connection().disconnect(QStringLiteral(UPOWER_SERVICE), QStringLiteral(UPOWER_PATH), @@ -229,8 +211,18 @@ void QUPowerDeviceInterface::connectNotify(const QMetaMethod &signal) { + static const QMetaMethod changedSignal = QMetaMethod::fromSignal(&QUPowerDeviceInterface::changed); static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QUPowerDeviceInterface::propertyChanged); + if (signal == changedSignal) { + if (!connection().connect(QLatin1String(UPOWER_SERVICE), + path(), + QLatin1String(UPOWER_DEVICE_SERVICE), + QLatin1String("Changed"), + this, SIGNAL(changed()))) { + qDebug() << "Error" << connection().lastError().message(); + } + } if (signal == propertyChangedSignal) { if (!connection().connect(QLatin1String(UPOWER_SERVICE), path(), @@ -244,7 +236,15 @@ void QUPowerDeviceInterface::disconnectNotify(const QMetaMethod &signal) { + static const QMetaMethod changedSignal = QMetaMethod::fromSignal(&QUPowerDeviceInterface::changed); static const QMetaMethod propertyChangedSignal = QMetaMethod::fromSignal(&QUPowerDeviceInterface::propertyChanged); + if (signal == changedSignal) { + connection().disconnect(QLatin1String(UPOWER_SERVICE), + path(), + QLatin1String(UPOWER_DEVICE_SERVICE), + QLatin1String("Changed"), + this, SIGNAL(changed())); + } if (signal == propertyChangedSignal) { connection().disconnect(QLatin1String(UPOWER_SERVICE), path(),