← Back to branch summary

~renatofilho/telephony-service/fix-phone-number-field-cursor

« back to all changes in this revision

Viewing changes to Ubuntu/Telephony/components.cpp

  • Committer: Gustavo Pichorim Boiko
  • Date: 2014-01-20 12:57:43 UTC
  • mto: This revision was merged to the branch mainline in revision 767.
  • Revision ID: gustavo.boiko@canonical.com-20140120125743-3b7uqlb2lhaxu22w
Improve the support for handling multiple calls by:
- Using a different approach to detect background calls in the QML plugin
- Make it possible to hangup the active call to answer an incoming one
- Show notifications when calls are put on hold, when they are rejected and when
  they end.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Ubuntu/Telephony/components.cpp
22
22
 
23
23
#include "components.h"
24
24
#include "telepathyhelper.h"
 
25
#include "callentry.h"
25
26
#include "callmanager.h"
26
27
#include "channelobserver.h"
27
28
#include "chatmanager.h"
59
60
{
60
61
    // @uri Telephony
61
62
    qmlRegisterUncreatableType<TelepathyHelper>(uri, 0, 1, "TelepathyHelper", "This is a singleton helper class");
 
63
    qmlRegisterUncreatableType<CallEntry>(uri, 0, 1, "CallEntry", "Objects of this type are created in CallManager and made available to QML for usage");
62
64
    qmlRegisterType<ContactWatcher>(uri, 0, 1, "ContactWatcher");
63
65
}
64
66