diff --git a/connd/qconnectionagent.cpp b/connd/qconnectionagent.cpp index 3772e81a02edcc9349826ba97da6dcbf002ecec6..4d84f7a5ca05bb5759a9608007f2987d7f9b91cf 100644 --- a/connd/qconnectionagent.cpp +++ b/connd/qconnectionagent.cpp @@ -386,20 +386,6 @@ void QConnectionAgent::servicesError(const QString &errorMessage) Q_EMIT onErrorReported(serv->path(), errorMessage); } -void QConnectionAgent::ofonoServicesError(const QString &errorMessage) -{ - QOfonoConnectionContext *context = static_cast(sender()); - QVector services = netman->getServices("cellular"); - Q_FOREACH (NetworkService *serv, services) { - if (context->contextPath().contains(serv->path().section("_",2,2))) { - Q_EMIT onErrorReported(serv->path(), errorMessage); - qDebug() << serv->name() << errorMessage; - return; - } - } - qWarning() << "ofono error but could not discover connman service"; -} - void QConnectionAgent::networkStateChanged(const QString &state) { qDebug() << state; @@ -447,12 +433,6 @@ void QConnectionAgent::connmanAvailabilityChanged(bool b) } } -void QConnectionAgent::serviceAdded(const QString &srv) -{ - qDebug() << Q_FUNC_INFO << "<<<<"<< srv; - updateServices(); -} - void QConnectionAgent::setup() { qDebug() << Q_FUNC_INFO @@ -592,8 +572,7 @@ void QConnectionAgent::offlineModeChanged(bool b) void QConnectionAgent::flightModeDialogSuppressionTimeout() { - if (flightModeSuppression) - flightModeSuppression = false; + flightModeSuppression = false; } void QConnectionAgent::displayStateChanged(const QString &state) diff --git a/connd/qconnectionagent.h b/connd/qconnectionagent.h index d4b40d677ab381e17f5e30413edf406b721f9bf6..0c65fc3eb90079c92930b36f2d3056bf8a2f765c 100644 --- a/connd/qconnectionagent.h +++ b/connd/qconnectionagent.h @@ -154,12 +154,10 @@ private slots: void connmanAvailabilityChanged(bool b); void setup(); void servicesError(const QString &); - void ofonoServicesError(const QString &); void technologyPowerChanged(bool); void browserRequest(const QString &servicePath, const QString &url); void techChanged(); - void serviceAdded(const QString &); void servicesListChanged(const QStringList &); void offlineModeChanged(bool); void flightModeDialogSuppressionTimeout();