← Back to branch summary

~ubuntu-branches/ubuntu/trusty/telephony-service/trusty-proposed

« back to all changes in this revision

Viewing changes to indicator/callchannelobserver.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Michael Terry, Gustavo Pichorim Boiko
  • Date: 2014-03-19 02:49:40 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20140319024940-mdtcdwo6ef4pudh7
Tags: 0.1+14.04.20140319-0ubuntu1
[ Michael Terry ]
* Add support for sharing contact info of incoming texts with the
  greeter.
* Consolidate ringtone code and greeter code so that the service can
  listen to which user is selected in the greeter, and use their
  ringtone.

[ Gustavo Pichorim Boiko ]
* Make it possible to handle multiple telepathy accounts.
* Cleanup the build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
indicator/callchannelobserver.cpp
57
57
        return;
58
58
    }
59
59
 
60
 
    bool incoming = channel->initiatorContact() != TelepathyHelper::instance()->account()->connection()->selfContact();
 
60
    Tp::AccountPtr account = TelepathyHelper::instance()->accountForConnection(channel->connection());
 
61
    if (!account) {
 
62
        return;
 
63
    }
 
64
 
 
65
    bool incoming = channel->initiatorContact() != account->connection()->selfContact();
61
66
    bool missed = incoming && channel->callStateReason().reason == Tp::CallStateChangeReasonNoAnswer;
62
67
    QDateTime activeTimestamp = channel->property("activeTimestamp").toDateTime();
63
68