← Back to branch summary

~phablet-team/telephony-service/trunk

~phablet-team/telephony-service/trunk

« back to all changes in this revision

Viewing changes to libtelephonyservice/multimediaaccountentry.cpp

Committer: Tiago Salem Herrmann
Date: 2015-07-08 20:42:33 UTC
mfrom: (1090.1.2 telephony-service-accounts-refactor)
mto: (1109.1.3 send_image_im)
mto: This revision was merged to the branch mainline in revision 1141.
Revision ID: tiago.herrmann@canonical.com-20150708204233-nhdh8l57qg1n7ztc

merge telepathyhelper refactor branch

files modified:
handler/Handler.xml

handler/handlerdbus.cpp

handler/handlerdbus.h

handler/texthandler.cpp

indicator/voicemailindicator.cpp

libtelephonyservice/accountentry.cpp

libtelephonyservice/accountentry.h

libtelephonyservice/chatmanager.cpp

libtelephonyservice/multimediaaccountentry.cpp

libtelephonyservice/multimediaaccountentry.h

libtelephonyservice/ofonoaccountentry.cpp

libtelephonyservice/ofonoaccountentry.h

libtelephonyservice/telepathyhelper.cpp

libtelephonyservice/telepathyhelper.h

tests/common/telepathytest.cpp

tests/libtelephonyservice/AccountEntryTest.cpp

tests/libtelephonyservice/OfonoAccountEntryTest.cpp

tests/libtelephonyservice/TelepathyHelperTest.cpp

Show diffs side-by-side

added added

removed removed

libtelephonyservice/multimediaaccountentry.cpp

51

51

return mAccount->protocolInfo().addressableVCardFields();

52

52

}

53

53

54

void MultimediaAccountEntry::onConnectionChanged()

54

void MultimediaAccountEntry::onConnectionChanged(Tp::ConnectionPtr connection)

55

55

{

56

56

// make sure the generic code is also run

57

AccountEntry::onConnectionChanged();

57

AccountEntry::onConnectionChanged(connection);

58

58

}

Older »