← Back to branch summary

~laney/telephony-service/accountsservice

~laney/telephony-service/accountsservice

Viewing all changes in revision 767.

Committer: Iain Lane
Date: 2014-03-03 16:11:34 UTC
mfrom: (762.2.15 telephony-service)
Revision ID: iain.lane@canonical.com-20140303161134-l7gozl4ht03u877s

Merge trunk

files added:
approver/50-com.canonical.TelephonyServiceApprover.pkla

approver/com.canonical.TelephonyServiceApprover.policy

approver/com.canonical.TelephonyServiceApprover.xml

approver/greetercontacts.cpp

approver/greetercontacts.h

approver/tests

approver/tests/CMakeLists.txt

approver/tests/GreeterContactsTest.cpp

approver/tests/GreeterContactsTestServer.cpp

approver/tests/libsystem.c

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

libtelephonyservice/callnotification.cpp

libtelephonyservice/callnotification.h

files modified:
.bzrignore

CMakeLists.txt

Ubuntu/Telephony/components.cpp

approver/Approver.xml

approver/CMakeLists.txt

approver/approver.cpp

approver/approver.h

approver/approverdbus.cpp

approver/approverdbus.h

approver/main.cpp

debian/changelog

debian/control

debian/rules

debian/telephony-service.install

handler/CMakeLists.txt

handler/Handler.xml

handler/callhandler.cpp

handler/callhandler.h

handler/handlerdbus.cpp

handler/handlerdbus.h

handler/main.cpp

handler/texthandler.cpp

handler/texthandler.h

indicator/callchannelobserver.cpp

indicator/callchannelobserver.h

indicator/messagingmenu.cpp

indicator/messagingmenu.h

indicator/textchannelobserver.cpp

indicator/voicemailindicator.cpp

indicator/voicemailindicator.h

libtelephonyservice/CMakeLists.txt

libtelephonyservice/callentry.cpp

libtelephonyservice/callentry.h

libtelephonyservice/callmanager.cpp

libtelephonyservice/callmanager.h

libtelephonyservice/chatmanager.cpp

libtelephonyservice/chatmanager.h

libtelephonyservice/contactutils.cpp

libtelephonyservice/telepathyhelper.cpp

Show diffs side-by-side

added added

removed removed

Ubuntu/Telephony/components.cpp

approver/50-com.canonical.TelephonyServiceApprover.pkla

approver/Approver.xml

approver/CMakeLists.txt

approver/approver.cpp

approver/approver.h

approver/approverdbus.cpp

approver/approverdbus.h

approver/com.canonical.TelephonyServiceApprover.policy

approver/com.canonical.TelephonyServiceApprover.xml

approver/greetercontacts.cpp

approver/greetercontacts.h

approver/main.cpp

approver/tests/

approver/tests/CMakeLists.txt

approver/tests/GreeterContactsTest.cpp

approver/tests/GreeterContactsTestServer.cpp

approver/tests/libsystem.c

debian/changelog

debian/telephony-service.install

handler/CMakeLists.txt

handler/Handler.xml

handler/callhandler.cpp

handler/callhandler.h

handler/handlerdbus.cpp

handler/handlerdbus.h

handler/main.cpp

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

handler/texthandler.cpp

handler/texthandler.h

indicator/callchannelobserver.cpp

indicator/callchannelobserver.h

indicator/messagingmenu.cpp

indicator/messagingmenu.h

indicator/textchannelobserver.cpp

indicator/voicemailindicator.cpp

indicator/voicemailindicator.h

libtelephonyservice/CMakeLists.txt

libtelephonyservice/callentry.cpp

libtelephonyservice/callentry.h

libtelephonyservice/callmanager.cpp

libtelephonyservice/callmanager.h

libtelephonyservice/callnotification.cpp

libtelephonyservice/callnotification.h

libtelephonyservice/chatmanager.cpp

libtelephonyservice/chatmanager.h

libtelephonyservice/contactutils.cpp

libtelephonyservice/telepathyhelper.cpp

Older »