← 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/telepathyhelper.cpp

Committer: Michael Terry
Date: 2014-01-29 15:16:16 UTC
mfrom: (766 trunk)
mto: This revision was merged to the branch mainline in revision 769.
Revision ID: michael.terry@canonical.com-20140129151616-63986zad796m4gtl

Merge from trunk

files added:
handler/tests

handler/tests/CMakeLists.txt

handler/tests/HandlerTest.cpp

handler/tests/approver.cpp

handler/tests/approver.h

handler/tests/dbus-test-wrapper.sh.in

handler/tests/handlercontroller.cpp

handler/tests/handlercontroller.h

handler/tests/mock

handler/tests/mock/CMakeLists.txt

handler/tests/mock/MockConnection.xml

handler/tests/mock/callchannel.cpp

handler/tests/mock/callchannel.h

handler/tests/mock/connection.cpp

handler/tests/mock/connection.h

handler/tests/mock/dbustypes.h

handler/tests/mock/main.cpp

handler/tests/mock/mockconnectiondbus.cpp

handler/tests/mock/mockconnectiondbus.h

handler/tests/mock/protocol.cpp

handler/tests/mock/protocol.h

handler/tests/mock/textchannel.cpp

handler/tests/mock/textchannel.h

handler/tests/mockcontroller.cpp

handler/tests/mockcontroller.h

handler/tests/telepathyhelper.cpp

handler/tests/telepathyhelper.h

files modified:
.bzrignore

CMakeLists.txt

debian/control

debian/rules

handler/CMakeLists.txt

handler/main.cpp

indicator/messagingmenu.cpp

indicator/messagingmenu.h

indicator/voicemailindicator.cpp

indicator/voicemailindicator.h

libtelephonyservice/telepathyhelper.cpp

Show diffs side-by-side

added added

removed removed

libtelephonyservice/telepathyhelper.cpp

152

152

QStringList protocols;

153

153

protocols << "ufa"

154

154

<< "tel"

155

<< "ofono";

155

<< "ofono"

156

<< "mock"; // used for tests

156

157

return protocols;

157

158

}

158

159

Older »