diff --git a/src/bearer.h b/src/bearer.h --- a/src/bearer.h +++ b/src/bearer.h @@ -224,6 +224,18 @@ */ QDBusPendingReply disconnectBearer(); + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + /** * @return the DBUS path (uni) to the object */ diff --git a/src/bearer.cpp b/src/bearer.cpp --- a/src/bearer.cpp +++ b/src/bearer.cpp @@ -238,6 +238,18 @@ return d->bearerIface.Disconnect(); } +void ModemManager::Bearer::setTimeout(int timeout) +{ + Q_D(Bearer); + d->bearerIface.setTimeout(timeout); +} + +int ModemManager::Bearer::timeout() const +{ + Q_D(const Bearer); + return d->bearerIface.timeout(); +} + ModemManager::IpConfig ModemManager::BearerPrivate::ipConfigFromMap(const QVariantMap &map) { ModemManager::IpConfig result; diff --git a/src/call.h b/src/call.h --- a/src/call.h +++ b/src/call.h @@ -94,6 +94,18 @@ */ QString number() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void stateChanged(MMCallState oldState, MMCallState newState, MMCallStateReason reason); void numberChanged(const QString &number); diff --git a/src/call.cpp b/src/call.cpp --- a/src/call.cpp +++ b/src/call.cpp @@ -128,6 +128,18 @@ return d->number; } +void ModemManager::Call::setTimeout(int timeout) +{ + Q_D(Call); + d->callIface.setTimeout(timeout); +} + +int ModemManager::Call::timeout() const +{ + Q_D(const Call); + return d->callIface.timeout(); +} + void ModemManager::CallPrivate::onStateChanged(int oldState, int newState, uint reason) { Q_Q(Call); diff --git a/src/modem.h b/src/modem.h --- a/src/modem.h +++ b/src/modem.h @@ -467,6 +467,18 @@ */ IpBearerFamilies supportedIpFamilies() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void bearerAdded(const QString &bearer); void bearerRemoved(const QString &bearer); diff --git a/src/modem.cpp b/src/modem.cpp --- a/src/modem.cpp +++ b/src/modem.cpp @@ -575,6 +575,18 @@ return ret; } +void ModemManager::Modem::setTimeout(int timeout) +{ + Q_D(Modem); + d->modemIface.setTimeout(timeout); +} + +int ModemManager::Modem::timeout() const +{ + Q_D(const Modem); + return d->modemIface.timeout(); +} + void ModemManager::ModemPrivate::onPropertiesChanged(const QString &ifaceName, const QVariantMap &changedProps, const QStringList &invalidatedProps) { Q_UNUSED(invalidatedProps); diff --git a/src/modem3gpp.h b/src/modem3gpp.h --- a/src/modem3gpp.h +++ b/src/modem3gpp.h @@ -131,6 +131,18 @@ */ QDBusPendingReply scan(); + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void imeiChanged(const QString &imei); void registrationStateChanged(MMModem3gppRegistrationState registrationState); diff --git a/src/modem3gpp.cpp b/src/modem3gpp.cpp --- a/src/modem3gpp.cpp +++ b/src/modem3gpp.cpp @@ -124,6 +124,18 @@ return d->modem3gppIface.Scan(); } +void ModemManager::Modem3gpp::setTimeout(int timeout) +{ + Q_D(Modem3gpp); + d->modem3gppIface.setTimeout(timeout); +} + +int ModemManager::Modem3gpp::timeout() const +{ + Q_D(const Modem3gpp); + return d->modem3gppIface.timeout(); +} + void ModemManager::Modem3gppPrivate::onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) { Q_Q(Modem3gpp); diff --git a/src/modem3gppussd.h b/src/modem3gppussd.h --- a/src/modem3gppussd.h +++ b/src/modem3gppussd.h @@ -96,6 +96,18 @@ */ QString networkRequest() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void stateChanged(MMModem3gppUssdSessionState state); void networkNotificationChanged(const QString &networkNotification); diff --git a/src/modem3gppussd.cpp b/src/modem3gppussd.cpp --- a/src/modem3gppussd.cpp +++ b/src/modem3gppussd.cpp @@ -126,3 +126,15 @@ Q_D(const Modem3gppUssd); return d->networkRequest; } + +void ModemManager::Modem3gppUssd::setTimeout(int timeout) +{ + Q_D(Modem3gppUssd); + d->ussdIface.setTimeout(timeout); +} + +int ModemManager::Modem3gppUssd::timeout() const +{ + Q_D(const Modem3gppUssd); + return d->ussdIface.timeout(); +} diff --git a/src/modemcdma.h b/src/modemcdma.h --- a/src/modemcdma.h +++ b/src/modemcdma.h @@ -116,6 +116,18 @@ */ MMModemCdmaRegistrationState evdoRegistrationState() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: /** * This signal is emitted when the activation info this network changes diff --git a/src/modemcdma.cpp b/src/modemcdma.cpp --- a/src/modemcdma.cpp +++ b/src/modemcdma.cpp @@ -126,6 +126,18 @@ return d->evdoRegistrationState; } +void ModemManager::ModemCdma::setTimeout(int timeout) +{ + Q_D(ModemCdma); + d->modemCdmaIface.setTimeout(timeout); +} + +int ModemManager::ModemCdma::timeout() const +{ + Q_D(const ModemCdma); + return d->modemCdmaIface.timeout(); +} + void ModemManager::ModemCdmaPrivate::onActivationStateChanged(uint activation_state, uint activation_error, const QVariantMap &status_changes) { Q_Q(ModemCdma); diff --git a/src/modemlocation.h b/src/modemlocation.h --- a/src/modemlocation.h +++ b/src/modemlocation.h @@ -112,6 +112,18 @@ */ LocationInformationMap location() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void capabilitiesChanged(QFlags capabilities); void enabledCapabilitiesChanged(QFlags capabilities); diff --git a/src/modemlocation.cpp b/src/modemlocation.cpp --- a/src/modemlocation.cpp +++ b/src/modemlocation.cpp @@ -109,6 +109,18 @@ return d->location; } +void ModemManager::ModemLocation::setTimeout(int timeout) +{ + Q_D(ModemLocation); + d->modemLocationIface.setTimeout(timeout); +} + +int ModemManager::ModemLocation::timeout() const +{ + Q_D(const ModemLocation); + return d->modemLocationIface.timeout(); +} + void ModemManager::ModemLocationPrivate::onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) { Q_Q(ModemLocation); diff --git a/src/modemmessaging.h b/src/modemmessaging.h --- a/src/modemmessaging.h +++ b/src/modemmessaging.h @@ -105,6 +105,18 @@ */ ModemManager::Sms::Ptr findMessage(const QString &uni); + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: /** * Emitted when any part of a new SMS has been received or added (but not diff --git a/src/modemmessaging.cpp b/src/modemmessaging.cpp --- a/src/modemmessaging.cpp +++ b/src/modemmessaging.cpp @@ -195,3 +195,15 @@ Q_D(ModemMessaging); return d->findMessage(uni); } + +void ModemManager::ModemMessaging::setTimeout(int timeout) +{ + Q_D(ModemMessaging); + d->modemMessagingIface.setTimeout(timeout); +} + +int ModemManager::ModemMessaging::timeout() const +{ + Q_D(const ModemMessaging); + return d->modemMessagingIface.timeout(); +} diff --git a/src/modemoma.h b/src/modemoma.h --- a/src/modemoma.h +++ b/src/modemoma.h @@ -112,6 +112,18 @@ */ QDBusPendingReply cancelSession(); + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void featuresChanged(QFlags features); void pendingNetworkInitiatedSessionsChanged(const ModemManager::OmaSessionTypes &sessions); diff --git a/src/modemoma.cpp b/src/modemoma.cpp --- a/src/modemoma.cpp +++ b/src/modemoma.cpp @@ -118,6 +118,18 @@ return d->omaIface.CancelSession(); } +void ModemManager::ModemOma::setTimeout(int timeout) +{ + Q_D(ModemOma); + d->omaIface.setTimeout(timeout); +} + +int ModemManager::ModemOma::timeout() const +{ + Q_D(const ModemOma); + return d->omaIface.timeout(); +} + void ModemManager::ModemOmaPrivate::onSessionStateChanged(int oldState, int newState, uint failedReason) { Q_Q(ModemOma); diff --git a/src/modemsignal.h b/src/modemsignal.h --- a/src/modemsignal.h +++ b/src/modemsignal.h @@ -112,6 +112,18 @@ */ QDBusPendingReply setup(uint rate); + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void rateChanged(uint rate); void cdmaChanged(const QVariantMap &cdma); diff --git a/src/modemsignal.cpp b/src/modemsignal.cpp --- a/src/modemsignal.cpp +++ b/src/modemsignal.cpp @@ -106,6 +106,18 @@ return d->modemSignalIface.Setup(rate); } +void ModemManager::ModemSignal::setTimeout(int timeout) +{ + Q_D(ModemSignal); + d->modemSignalIface.setTimeout(timeout); +} + +int ModemManager::ModemSignal::timeout() const +{ + Q_D(const ModemSignal); + return d->modemSignalIface.timeout(); +} + void ModemManager::ModemSignalPrivate::onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) { Q_Q(ModemSignal); diff --git a/src/modemsimple.h b/src/modemsimple.h --- a/src/modemsimple.h +++ b/src/modemsimple.h @@ -117,6 +117,18 @@ * Convenient method calling disconnectModem with "/" to make ModemManager disconnect all modems */ QDBusPendingReply disconnectAllModems(); + + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; }; } // namespace ModemManager diff --git a/src/modemsimple.cpp b/src/modemsimple.cpp --- a/src/modemsimple.cpp +++ b/src/modemsimple.cpp @@ -77,3 +77,15 @@ { return disconnectModem(QStringLiteral("/")); } + +void ModemManager::ModemSimple::setTimeout(int timeout) +{ + Q_D(ModemSimple); + d->modemSimpleIface.setTimeout(timeout); +} + +int ModemManager::ModemSimple::timeout() const +{ + Q_D(const ModemSimple); + return d->modemSimpleIface.timeout(); +} diff --git a/src/modemtime.h b/src/modemtime.h --- a/src/modemtime.h +++ b/src/modemtime.h @@ -126,6 +126,18 @@ */ ModemManager::NetworkTimezone networkTimezone() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: /** * Sent when the network time is updated. diff --git a/src/modemtime.cpp b/src/modemtime.cpp --- a/src/modemtime.cpp +++ b/src/modemtime.cpp @@ -160,6 +160,18 @@ return result; } +void ModemManager::ModemTime::setTimeout(int timeout) +{ + Q_D(ModemTime); + d->modemTimeIface.setTimeout(timeout); +} + +int ModemManager::ModemTime::timeout() const +{ + Q_D(const ModemTime); + return d->modemTimeIface.timeout(); +} + void ModemManager::ModemTimePrivate::onNetworkTimeChanged(const QString &isoDateTime) { Q_Q(ModemTime); diff --git a/src/modemvoice.h b/src/modemvoice.h --- a/src/modemvoice.h +++ b/src/modemvoice.h @@ -87,6 +87,18 @@ */ ModemManager::Call::Ptr findCall(const QString &uni); + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: /** * Emitted when an new Call is detected. diff --git a/src/modemvoice.cpp b/src/modemvoice.cpp --- a/src/modemvoice.cpp +++ b/src/modemvoice.cpp @@ -147,3 +147,15 @@ Q_D(ModemVoice); return d->findCall(uni); } + +void ModemManager::ModemVoice::setTimeout(int timeout) +{ + Q_D(ModemVoice); + d->modemVoiceIface.setTimeout(timeout); +} + +int ModemManager::ModemVoice::timeout() const +{ + Q_D(const ModemVoice); + return d->modemVoiceIface.timeout(); +} diff --git a/src/sim.h b/src/sim.h --- a/src/sim.h +++ b/src/sim.h @@ -103,6 +103,18 @@ QString uni() const; + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: void simIdentifierChanged(const QString &identifier); void imsiChanged(const QString &imsi); diff --git a/src/sim.cpp b/src/sim.cpp --- a/src/sim.cpp +++ b/src/sim.cpp @@ -120,6 +120,18 @@ return d->uni; } +void ModemManager::Sim::setTimeout(int timeout) +{ + Q_D(Sim); + d->simIface.setTimeout(timeout); +} + +int ModemManager::Sim::timeout() const +{ + Q_D(const Sim); + return d->simIface.timeout(); +} + void ModemManager::SimPrivate::onPropertiesChanged(const QString &interface, const QVariantMap &properties, const QStringList &invalidatedProps) { Q_Q(Sim); diff --git a/src/sms.h b/src/sms.h --- a/src/sms.h +++ b/src/sms.h @@ -155,6 +155,19 @@ */ MMSmsCdmaTeleserviceId teleserviceId() const; #endif + + /** + * Sets the timeout in milliseconds for all async method DBus calls. + * -1 means the default DBus timeout (usually 25 seconds). + */ + void setTimeout(int timeout); + + /** + * Returns the current value of the DBus timeout in milliseconds. + * -1 means the default DBus timeout (usually 25 seconds). + */ + int timeout() const; + Q_SIGNALS: /** * This signal is emitted when the state of the SMS has changed diff --git a/src/sms.cpp b/src/sms.cpp --- a/src/sms.cpp +++ b/src/sms.cpp @@ -207,6 +207,17 @@ } #endif +void ModemManager::Sms::setTimeout(int timeout) +{ + Q_D(Sms); + d->smsIface.setTimeout(timeout); +} + +int ModemManager::Sms::timeout() const +{ + Q_D(const Sms); + return d->smsIface.timeout(); +} void ModemManager::SmsPrivate::onPropertiesChanged(const QString &interfaceName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties) {