← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ofono-qt/vivid

« back to all changes in this revision

Viewing changes to lib/ofonovoicecallmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Tiago Salem Herrmann
  • Date: 2014-03-13 10:16:00 UTC
  • Revision ID: package-import@ubuntu.com-20140313101600-xl4z34ogvjbgpdrw
Tags: 1.5+git20120419+bcf0c04-0ubuntu5
Make createMultiparty() synchronous

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ofonovoicecallmanager.cpp
256
256
                                        PRIVATE_CHAT_TIMEOUT);
257
257
}
258
258
 
259
 
void OfonoVoiceCallManager::createMultiparty()
 
259
QList<QDBusObjectPath> OfonoVoiceCallManager::createMultiparty()
260
260
{
261
261
    QDBusMessage request;
 
262
    QDBusReply<QList<QDBusObjectPath> > reply;
262
263
    request = QDBusMessage::createMethodCall("org.ofono",
263
264
                                             path(), m_if->ifname(),
264
265
                                             "CreateMultiparty");
265
266
 
266
 
    QDBusConnection::systemBus().callWithCallback(request, this,
267
 
                                        SLOT(createMultipartyResp(const QList<QDBusObjectPath>&)),
268
 
                                        SLOT(createMultipartyErr(const QDBusError&)),
269
 
                                        CREATE_MULTIPARTY_TIMEOUT);
 
267
    request = QDBusMessage::createMethodCall("org.ofono",
 
268
                                             path(), m_if->ifname(),
 
269
                                             "CreateMultiparty");
 
270
    reply = QDBusConnection::systemBus().call(request);
 
271
    bool success = reply.isValid();
 
272
    if (!success) {
 
273
        m_if->setError(reply.error().name(), reply.error().message());
 
274
    }
 
275
    return reply;
270
276
}
271
277
 
272
278
void OfonoVoiceCallManager::hangupMultiparty()