Commit f3d220e9 authored by Jenkins's avatar Jenkins

New upstream version 1.5+git20120419+bcf0c04

parent 6101f0e5
*.o
*.a
*.moc
moc_*
Makefile*
*.so*
*.pc
*.prl
doxygen.cfg
doc/
Alexander Kanavin <alex.kanavin@gmail.com>
Jukka Saunamäki <jukka.saunamaki@nokia.com>
This diff is collapsed.
The Qt coding style is defined at
http://qt.gitorious.org/qt/pages/QtCodingStyle
so let's follow that.
Overall, the basic rule is simple: follow the coding style, and the design and
functionality patterns that are already there. There are patterns for
getting and setting oFono properties, calling methods and getting the
method call result, setting the errors, and receiving out-of-band signals.
Hopefully that should be enough for any remaining APIs which are currently
missing (some APIs such as SIM toolkit require implementing a d-bus agent for
which there is no example yet).
For any new API that is added, there should also be a test case. Again, try to
imitate existing test cases. It is not necessary to thoroughly test the
functionality; it is enough to go through all properties, methods and signals
and check that they work, return sane values and match the actual oFono API.
The tests should be written against Phonesim phone simulator and it's
preferred that they should be able to run without manual intervention.
This package contains Qt bindings to a number of oFono cellular service interfaces.
Amount of effort required:
* small
** medium
*** large
Implement missing APIs:
org.ofono.AssistedSatelliteNavigation and org.ofono.PositioningRequestAgent **
org.ofono.AudioSettings *
org.ofono.CallMeter * (class implementation exists, but lots of missing
stuff)
org.ofono.cdma.ConnectionManager **
org.ofono.cdma.MessageManager ***
org.ofono.cdma.NetworkRegistration **
org.ofono.cdma.VoiceCallManager **
org.ofono.CellBroadcast **
org.ofono.Handsfree *
org.ofono.LocationReporting *
org.ofono.PushNotification and org.ofono.PushNotificationAgent **
org.ofono.SmartMessaging and org.ofono.SmartMessagingAgent **
org.ofono.SimToolkit and org.ofono.SimToolkitAgent ***
org.ofono.TextTelephony *
Call History - that seems to be a separately available plugin and I can't
find where it is.
More formal "certification" of ofono-qt to specific ofono versions
- the versioning should match ofono's
- when new version of ofono is out, diff of ofono/doc/* can serve
as a list of things to fix
include: 'https://gitlab.com/debian-pm/tools/build/raw/master/docker/gitlab-ci-base.yml'
image: jbbgameich/build
ofono-qt (1.5+git20120419+bcf0c04-1) UNRELEASED; urgency=medium
* Update to Standards-version 4.2.1
* debhelper 11
-- Jonah Brüchert <jbb@kaidan.im> Wed, 04 Apr 2018 17:48:41 +0200
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu8~gcc5.1) wily; urgency=medium
* No-change test rebuild for g++5 ABI transition
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 15 Jul 2015 15:43:04 +0000
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu7) utopic; urgency=medium
* Changes to enable reverse-deps to be cross-built, since cross-pkg-config
no longer looks in /usr/lib/pkgconfig for pcfiles. (LP: #1316667)
* debian/patches/11_use_libdir: Install library and pcfile into libdir,
which for Ubuntu is a multiarch path.
* Mark the library package as Multi-Arch: same.
-- Iain Lane <iain.lane@canonical.com> Thu, 08 May 2014 11:33:37 +0100
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu6) trusty; urgency=medium
* Do not fallback to / when using ManualSelect (LP: #1297586)
-- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Wed, 26 Mar 2014 10:32:16 -0300
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu5) trusty; urgency=medium
* Make createMultiparty() synchronous
-- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Thu, 13 Mar 2014 10:16:00 -0200
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu4) trusty; urgency=medium
* Rebuild to solve a powerpc dependency problem.
-- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 07 Mar 2014 11:38:09 +0200
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu3) trusty; urgency=medium
* Rebuild against Qt 5.2.1
-- Timo Jyrinki <timo-jyrinki@ubuntu.com> Wed, 05 Mar 2014 11:44:40 +0200
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu2) trusty; urgency=medium
* Add delivery report support
-- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Fri, 10 Jan 2014 17:13:30 -0200
ofono-qt (1.5+git20120419+bcf0c04-0ubuntu1) saucy; urgency=low
* Initial release for Ubuntu
-- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Tue, 04 Jun 2013 06:39:51 -0300
Source: ofono-qt
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Build-Depends: debhelper (>= 11),
doxygen,
qt5-default (>= 5.0),
qtbase5-dev (>= 5.0),
Standards-Version: 4.2.1
Section: libs
Homepage: git://gitorious.org/meego-cellular/ofono-qt.git
Vcs-Git: https://gitlab.com/debian-pm/libs/ofono-qt.git
Vcs-Browser: https://gitlab.com/debian-pm/libs/ofono-qt
Package: libofono-qt1
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: same
Description: Qt oFono library
This package contains ofono-qt, a Qt-based library that provides
bindings to oFono.
.
oFono is a free software project for mobile telephony (GSM/UMTS)
applications. It is build on 3GPP standards and uses a high-level
D-Bus API for use by telephony applications.
Package: libofono-qt-dev
Section: libdevel
Architecture: any
Depends: libofono-qt1 (= ${binary:Version}), ${misc:Depends}
Description: Qt oFono library (development files)
This package contains development files for ofono-qt, a Qt-based
library that provides bindings to oFono.
.
oFono is a free software project for mobile telephony (GSM/UMTS)
applications. It is build on 3GPP standards and uses a high-level
D-Bus API for use by telephony applications.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ofono-qt
Upstream-Contact: Alexander Kanavin <alex.kanavin@gmail.com>
Source: http://gitorious.org/meego-cellular/ofono-qt
Files: *
Copyright: 2010-2012, Nokia Corporation and/or its subsidiary(-ies)
License: LGPL-2.1
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation, version 2.1 of
the License.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Files: lib/*
Copyright: 2010, 2011, Nokia Corporation and/or its subsidiary(-ies).
License: LGPL-2.1
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation, version 2.1 of
the License.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Files: lib/ofonovoicecallmanager.cpp
lib/ofonovoicecallmanager.h
Copyright: 2011, Intel Corporation
2010, 2011, Nokia Corporation and/or its subsidiary(-ies).
License: LGPL-2.1
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation, version 2.1 of
the License.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Files: tests/*
Copyright: 2010, 2011, Nokia Corporation and/or its subsidiary(-ies).
License: LGPL-2.1
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation, version 2.1 of
the License.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Files: tests/test_ofonomultipartycall.cpp
Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies).
2011, Intel Corporation
License: LGPL-2.1
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation, version 2.1 of
the License.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
usr/include/*
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*
This diff is collapsed.
Description: update MessageManager and VoiceCallManager interfaces to match latest ofono api
Author: Tiago Salem Herrmann <tiago.herrmann@canonical.com>
Forwarded: no
diff:
=== modified file 'a/lib/ofonomessagemanager.cpp'
--- a/lib/ofonomessagemanager.cpp
+++ b/lib/ofonomessagemanager.cpp
@@ -175,19 +175,21 @@ void OfonoMessageManager::setAlphabet(QS
}
-void OfonoMessageManager::sendMessage(const QString &to, const QString &message)
+QDBusObjectPath OfonoMessageManager::sendMessage(const QString &to, const QString &message)
{
QDBusMessage request;
+ QDBusReply<QDBusObjectPath> reply;
+ QDBusObjectPath objpath;
request = QDBusMessage::createMethodCall("org.ofono",
path(), m_if->ifname(),
"SendMessage");
-
request << to << message;
-
- QDBusConnection::systemBus().callWithCallback(request, this,
- SLOT(sendMessageResp(const QDBusObjectPath&)),
- SLOT(sendMessageErr(const QDBusError&)));
+ reply = QDBusConnection::systemBus().call(request);
+ if (reply.isValid()) {
+ objpath = reply;
+ }
+ return objpath;
}
void OfonoMessageManager::requestPropertyComplete(bool success, const QString& property, const QVariant& value)
@@ -229,17 +231,6 @@ void OfonoMessageManager::setPropertyFai
}
}
-void OfonoMessageManager::sendMessageResp(const QDBusObjectPath& objectPath)
-{
- emit sendMessageComplete(true, objectPath.path());
-}
-
-void OfonoMessageManager::sendMessageErr(QDBusError error)
-{
- m_if->setError(error.name(), error.message());
- emit sendMessageComplete(false, QString());
-}
-
QStringList OfonoMessageManager::getMessages() const
{
return m_messagelist;
--- a/lib/ofonomessagemanager.h
+++ b/lib/ofonomessagemanager.h
@@ -64,7 +64,7 @@ public Q_SLOTS:
void requestAlphabet();
void setAlphabet(QString alphabet);
- void sendMessage(const QString &to, const QString &message);
+ QDBusObjectPath sendMessage(const QString &to, const QString &message);
Q_SIGNALS:
void serviceCenterAddressChanged(const QString &address);
@@ -96,8 +96,6 @@ private Q_SLOTS:
void requestPropertyComplete(bool success, const QString &property, const QVariant &value);
void onMessageAdded(const QDBusObjectPath &message, const QVariantMap &properties);
void onMessageRemoved(const QDBusObjectPath &message);
- void sendMessageResp(const QDBusObjectPath& objectPath);
- void sendMessageErr(QDBusError error);
private:
QStringList getMessageList();
--- a/lib/ofonovoicecallmanager.cpp
+++ b/lib/ofonovoicecallmanager.cpp
@@ -139,9 +139,11 @@ void OfonoVoiceCallManager::connectDbusS
SIGNAL(forwarded(const QString&)));
}
-void OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide)
+QDBusObjectPath OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide)
{
QDBusMessage request;
+ QDBusReply<QDBusObjectPath> reply;
+ QDBusObjectPath objpath;
request = QDBusMessage::createMethodCall("org.ofono",
path(), m_if->ifname(),
"Dial");
@@ -149,10 +151,12 @@ void OfonoVoiceCallManager::dial(const Q
arg.append(QVariant(number));
arg.append(QVariant(callerid_hide));
request.setArguments(arg);
- QDBusConnection::systemBus().callWithCallback(request, this,
- SLOT(dialResp()),
- SLOT(dialErr(const QDBusError&)),
- DIAL_TIMEOUT);
+
+ reply = QDBusConnection::systemBus().call(request);
+ if (reply.isValid()) {
+ objpath = reply;
+ }
+ return objpath;
}
void OfonoVoiceCallManager::hangupAll()
@@ -410,10 +414,10 @@ QStringList OfonoVoiceCallManager::getCa
return m_calllist;
}
-void OfonoVoiceCallManager::callAddedChanged(const QDBusObjectPath &path, const QVariantMap& /*values*/)
+void OfonoVoiceCallManager::callAddedChanged(const QDBusObjectPath &path, const QVariantMap& values)
{
m_calllist << path.path();
- emit callAdded(path.path());
+ emit callAdded(path.path(), values);
}
void OfonoVoiceCallManager::callRemovedChanged(const QDBusObjectPath &path)
--- a/lib/ofonovoicecallmanager.h
+++ b/lib/ofonovoicecallmanager.h
@@ -65,7 +65,7 @@ public:
Q_INVOKABLE QStringList getCalls() const;
public Q_SLOTS:
- void dial(const QString &number, const QString &callerid_hide);
+ QDBusObjectPath dial(const QString &number, const QString &callerid_hide);
void hangupAll();
void sendTones(const QString &tonestring);
void transfer();
@@ -78,7 +78,7 @@ public Q_SLOTS:
Q_SIGNALS:
void emergencyNumbersChanged(const QStringList &numbers);
- void callAdded(const QString &call);
+ void callAdded(const QString &call, const QVariantMap &values);
void callRemoved(const QString &call);
void dialComplete(const bool status);
void hangupAllComplete(const bool status);
@@ -98,7 +98,7 @@ private Q_SLOTS:
void validityChanged(bool);
void pathChanged(const QString& path);
void propertyChanged(const QString &property, const QVariant &value);
- void callAddedChanged(const QDBusObjectPath &call, const QVariantMap &properties);
+ void callAddedChanged(const QDBusObjectPath &call, const QVariantMap &values);
void callRemovedChanged(const QDBusObjectPath &call);
void dialResp();
void dialErr(const QDBusError &error);
Description: set errors on dial() and sendMessage()
Author: Tiago Salem Herrmann <tiago.herrmann@canonical.com>
Forwarded: no
diff:
=== modified file 'a/lib/ofonomessagemanager.cpp'
--- a/lib/ofonomessagemanager.cpp
+++ b/lib/ofonomessagemanager.cpp
@@ -175,7 +175,7 @@ void OfonoMessageManager::setAlphabet(QS
}
-QDBusObjectPath OfonoMessageManager::sendMessage(const QString &to, const QString &message)
+QDBusObjectPath OfonoMessageManager::sendMessage(const QString &to, const QString &message, bool &success)
{
QDBusMessage request;
QDBusReply<QDBusObjectPath> reply;
@@ -188,6 +188,10 @@ QDBusObjectPath OfonoMessageManager::sen
reply = QDBusConnection::systemBus().call(request);
if (reply.isValid()) {
objpath = reply;
+ success = true;
+ } else {
+ m_if->setError(reply.error().name(), reply.error().message());
+ success = false;
}
return objpath;
}
--- a/lib/ofonomessagemanager.h
+++ b/lib/ofonomessagemanager.h
@@ -64,7 +64,7 @@ public Q_SLOTS:
void requestAlphabet();
void setAlphabet(QString alphabet);
- QDBusObjectPath sendMessage(const QString &to, const QString &message);
+ QDBusObjectPath sendMessage(const QString &to, const QString &message, bool &success);
Q_SIGNALS:
void serviceCenterAddressChanged(const QString &address);
@@ -76,7 +76,6 @@ Q_SIGNALS:
void useDeliveryReportsComplete(bool success, const bool &useDeliveryReports);
void bearerComplete(bool success, const QString &bearer);
void alphabetComplete(bool success, const QString &alphabet);
- void sendMessageComplete(bool success, const QString& path);
void setServiceCenterAddressFailed();
void setUseDeliveryReportsFailed();
--- a/lib/ofonovoicecallmanager.cpp
+++ b/lib/ofonovoicecallmanager.cpp
@@ -139,7 +139,7 @@ void OfonoVoiceCallManager::connectDbusS
SIGNAL(forwarded(const QString&)));
}
-QDBusObjectPath OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide)
+QDBusObjectPath OfonoVoiceCallManager::dial(const QString &number, const QString &callerid_hide, bool &success)
{
QDBusMessage request;
QDBusReply<QDBusObjectPath> reply;
@@ -155,6 +155,10 @@ QDBusObjectPath OfonoVoiceCallManager::d
reply = QDBusConnection::systemBus().call(request);
if (reply.isValid()) {
objpath = reply;
+ success = true;
+ } else {
+ m_if->setError(reply.error().name(), reply.error().message());
+ success = false;
}
return objpath;
}
@@ -354,17 +358,6 @@ void OfonoVoiceCallManager::swapCallsErr
emit swapCallsComplete(false);
}
-void OfonoVoiceCallManager::dialResp()
-{
- emit dialComplete(true);
-}
-
-void OfonoVoiceCallManager::dialErr(const QDBusError &error)
-{
- m_if->setError(error.name(), error.message());
- emit dialComplete(false);
-}
-
void OfonoVoiceCallManager::hangupAllResp()
{
emit hangupAllComplete(true);
--- a/lib/ofonovoicecallmanager.h
+++ b/lib/ofonovoicecallmanager.h
@@ -65,7 +65,7 @@ public:
Q_INVOKABLE QStringList getCalls() const;
public Q_SLOTS:
- QDBusObjectPath dial(const QString &number, const QString &callerid_hide);
+ QDBusObjectPath dial(const QString &number, const QString &callerid_hide, bool &success);
void hangupAll();
void sendTones(const QString &tonestring);
void transfer();
@@ -80,7 +80,6 @@ Q_SIGNALS:
void emergencyNumbersChanged(const QStringList &numbers);
void callAdded(const QString &call, const QVariantMap &values);
void callRemoved(const QString &call);
- void dialComplete(const bool status);
void hangupAllComplete(const bool status);
void sendTonesComplete(const bool status);
void transferComplete(const bool status);
@@ -100,8 +99,6 @@ private Q_SLOTS:
void propertyChanged(const QString &property, const QVariant &value);
void callAddedChanged(const QDBusObjectPath &call, const QVariantMap &values);
void callRemovedChanged(const QDBusObjectPath &call);
- void dialResp();
- void dialErr(const QDBusError &error);
void hangupAllResp();
void hangupAllErr(const QDBusError &error);
void sendTonesResp();
Description: update connman interface to the new layout
Author: Tiago Salem Herrmann <tiago.herrmann@canonical.com>
Forwarded: no
diff:
=== modified file 'a/lib/ofonoconnman.cpp'
--- a/lib/ofonoconnman.cpp
+++ b/lib/ofonoconnman.cpp
@@ -146,9 +146,11 @@ void OfonoConnMan::deactivateAllErr(cons
emit deactivateAllComplete(false);
}
-void OfonoConnMan::addContext(const QString& type)
+QDBusObjectPath OfonoConnMan::addContext(const QString& type, bool &success)
{
QDBusMessage request;
+ QDBusReply<QDBusObjectPath> reply;
+ QDBusObjectPath objpath;
request = QDBusMessage::createMethodCall("org.ofono",
path(), m_if->ifname(),
@@ -158,10 +160,15 @@ void OfonoConnMan::addContext(const QStr
arg.append(QVariant(type));
request.setArguments(arg);
- QDBusConnection::systemBus().callWithCallback(request, this,
- SLOT(addContextResp(const QDBusObjectPath &)),
- SLOT(addContextErr(const QDBusError&)),
- ADD_TIMEOUT);
+ reply = QDBusConnection::systemBus().call(request);
+ if (reply.isValid()) {
+ objpath = reply;
+ success = true;
+ } else {
+ m_if->setError(reply.error().name(), reply.error().message());
+ success = false;
+ }
+ return objpath;
}
void OfonoConnMan::addContextResp(const QDBusObjectPath &path)
--- a/lib/ofonoconnman.h
+++ b/lib/ofonoconnman.h
@@ -71,7 +71,7 @@ public Q_SLOTS:
void setPowered(const bool);
void setRoamingAllowed(const bool);
void deactivateAll();
- void addContext(const QString& type);
+ QDBusObjectPath addContext(const QString& type, bool &success);
void removeContext(const QString& path);
Q_SIGNALS:
This diff is collapsed.
Description: Simplify code logic
Author: Tiago Salem Herrmann <tiago.herrmann@canonical.com>
Forwarded: no
diff:
=== modified file 'a/lib/ofonoconnman.cpp'
--- a/lib/ofonoconnman.cpp
+++ b/lib/ofonoconnman.cpp
@@ -150,7 +150,6 @@ QDBusObjectPath OfonoConnMan::addContext
{
QDBusMessage request;
QDBusReply<QDBusObjectPath> reply;
- QDBusObjectPath objpath;
request = QDBusMessage::createMethodCall("org.ofono",
path(), m_if->ifname(),
@@ -161,14 +160,11 @@ QDBusObjectPath OfonoConnMan::addContext
request.setArguments(arg);
reply = QDBusConnection::systemBus().call(request);
- if (reply.isValid()) {
- objpath = reply;
- success = true;
- } else {
+ success = reply.isValid();
+ if (!success) {
m_if->setError(reply.error().name(), reply.error().message());
- success = false;
}
- return objpath;
+ return reply;
}
void OfonoConnMan::addContextResp(const QDBusObjectPath &path)
--- a/lib/ofonomessagemanager.cpp
+++ b/lib/ofonomessagemanager.cpp
@@ -179,21 +179,17 @@ QDBusObjectPath OfonoMessageManager::sen
{
QDBusMessage request;
QDBusReply<QDBusObjectPath> reply;
- QDBusObjectPath objpath;
request = QDBusMessage::createMethodCall("org.ofono",
path(), m_if->ifname(),
"SendMessage");
request << to << message;
reply = QDBusConnection::systemBus().call(request);
- if (reply.isValid()) {
- objpath = reply;
- success = true;
- } else {
+ success = reply.isValid();
+ if (!success) {
m_if->setError(reply.error().name(), reply.error().message());
- success = false;
}
- return objpath;
+ return reply;
}
void OfonoMessageManager::requestPropertyComplete(bool success, const QString& property, const QVariant& value)
--- a/lib/ofonovoicecallmanager.cpp
+++ b/lib/ofonovoicecallmanager.cpp
@@ -143,7 +143,6 @@ QDBusObjectPath OfonoVoiceCallManager::d
{
QDBusMessage request;
QDBusReply<QDBusObjectPath> reply;
- QDBusObjectPath objpath;
request = QDBusMessage::createMethodCall("org.ofono",
path(), m_if->ifname(),
"Dial");
@@ -153,14 +152,11 @@ QDBusObjectPath OfonoVoiceCallManager::d
request.setArguments(arg);
reply = QDBusConnection::systemBus().call(request);
- if (reply.isValid()) {
- objpath = reply;
- success = true;
- } else {
+ success = reply.isValid();
+ if (!success) {
m_if->setError(reply.error().name(), reply.error().message());
- success = false;
}
- return objpath;
+ return reply;
}