diff --git a/rpm/libusb-moded-qt5.spec b/rpm/libusb-moded-qt5.spec index 8facf29..117bb30 100644 --- a/rpm/libusb-moded-qt5.spec +++ b/rpm/libusb-moded-qt5.spec @@ -10,8 +10,8 @@ Source0: %{name}-%{version}.tar.bz2 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: usb-moded >= 0.86.0+mer29 -BuildRequires: usb-moded-devel >= 0.86.0+mer29 +Requires: usb-moded >= 0.86.0+mer39 +BuildRequires: usb-moded-devel >= 0.86.0+mer39 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(usb_moded) diff --git a/src/qusbmoded.cpp b/src/qusbmoded.cpp index cd495cb..8348492 100644 --- a/src/qusbmoded.cpp +++ b/src/qusbmoded.cpp @@ -224,7 +224,7 @@ void QUsbModed::setup() connect(iPrivate->iInterface, &QUsbModedInterface::sig_usb_available_modes_ind, this, - &QUsbModed::updateAvailableModes); + &QUsbModed::checkAvailableModesForUser); connect(iPrivate->iInterface, SIGNAL(sig_usb_hidden_modes_ind(QString)), SLOT(onUsbHiddenModesChanged(QString))); @@ -241,7 +241,7 @@ void QUsbModed::setup() iPrivate->iPendingCalls |= USB_MODED_CALL_GET_AVAILABLE_MODES; connect(new QDBusPendingCallWatcher( - iPrivate->iInterface->get_available_modes(), iPrivate->iInterface), + iPrivate->iInterface->get_available_modes_for_user(), iPrivate->iInterface), &QDBusPendingCallWatcher::finished, this, &QUsbModed::onGetAvailableModesFinished); @@ -412,6 +412,15 @@ void QUsbModed::updateAvailableModes(const QString &aModes) } } +void QUsbModed::checkAvailableModesForUser() +{ + connect(new QDBusPendingCallWatcher( + iPrivate->iInterface->get_available_modes_for_user(), iPrivate->iInterface), + &QDBusPendingCallWatcher::finished, + this, + &QUsbModed::onGetAvailableModesFinished); +} + void QUsbModed::setupCallFinished(int aCallId) { ASSERT_(iPrivate->iPendingCalls & aCallId); diff --git a/src/qusbmoded.h b/src/qusbmoded.h index 54ba55a..72eca84 100644 --- a/src/qusbmoded.h +++ b/src/qusbmoded.h @@ -109,6 +109,7 @@ private Q_SLOTS: void setupCallFinished(int callId); void updateSupportedModes(QString modes); void updateAvailableModes(const QString &modes); + void checkAvailableModesForUser(); void updateHiddenModes(QString modes); private: