telephony-service

Merge lp:~tiagosh/telephony-service/update-tp-qt-0.9.6.1 into lp:telephony-service

  1. update-tp-qt-0.9.6.1
  2. Merge into trunk
Proposed by Tiago Salem Herrmann on 2015-06-16
Status: Merged
Approved by: Gustavo Pichorim Boiko on 2015-07-06
Approved revision: 1084
Merged at revision: 1094
Proposed branch: lp:~tiagosh/telephony-service/update-tp-qt-0.9.6.1
Merge into: lp:telephony-service
Diff against target: 136 lines (+26/-15)
6 files modified
tests/common/mock/callchannel.cpp (+1/-1)
tests/common/mock/conferencecallchannel.cpp (+1/-1)
tests/common/mock/connection.cpp (+20/-8)
tests/common/mock/connection.h (+1/-2)
tests/common/mock/protocol.cpp (+1/-1)
tests/common/mock/textchannel.cpp (+2/-2)
To merge this branch: bzr merge lp:~tiagosh/telephony-service/update-tp-qt-0.9.6.1
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) 2015-06-16 Approve on 2015-07-06
PS Jenkins bot continuous-integration Needs Fixing on 2015-06-16
Review via email: mp+262106@code.launchpad.net

Commit Message

Update to telepathy-qt 0.9.6.1

Description of the Change

Update to telepathy-qt 0.9.6.1

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/common/mock/callchannel.cpp'
2--- tests/common/mock/callchannel.cpp 2015-03-23 19:59:50 +0000
3+++ tests/common/mock/callchannel.cpp 2015-06-16 16:01:32 +0000
4@@ -28,7 +28,7 @@
5 mTargetHandle(targetHandle),
6 mState(state)
7 {
8- Tp::BaseChannelPtr baseChannel = Tp::BaseChannel::create(mConnection, TP_QT_IFACE_CHANNEL_TYPE_CALL, targetHandle, Tp::HandleTypeContact);
9+ Tp::BaseChannelPtr baseChannel = Tp::BaseChannel::create(mConnection, TP_QT_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact, targetHandle);
10 Tp::BaseChannelCallTypePtr callType = Tp::BaseChannelCallType::create(baseChannel.data(),
11 true,
12 Tp::StreamTransportTypeUnknown,
13
14=== modified file 'tests/common/mock/conferencecallchannel.cpp'
15--- tests/common/mock/conferencecallchannel.cpp 2014-03-20 21:03:26 +0000
16+++ tests/common/mock/conferencecallchannel.cpp 2015-06-16 16:01:32 +0000
17@@ -36,7 +36,7 @@
18 }
19 }
20
21- Tp::BaseChannelPtr baseChannel = Tp::BaseChannel::create(mConnection, TP_QT_IFACE_CHANNEL_TYPE_CALL, 0, Tp::HandleTypeNone);
22+ Tp::BaseChannelPtr baseChannel = Tp::BaseChannel::create(mConnection, TP_QT_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeNone, 0);
23 Tp::BaseChannelCallTypePtr callType = Tp::BaseChannelCallType::create(baseChannel.data(),
24 true,
25 Tp::StreamTransportTypeUnknown,
26
27=== modified file 'tests/common/mock/connection.cpp'
28--- tests/common/mock/connection.cpp 2015-05-08 21:57:06 +0000
29+++ tests/common/mock/connection.cpp 2015-06-16 16:01:32 +0000
30@@ -78,7 +78,7 @@
31 // init presence interface
32 simplePresenceIface = Tp::BaseConnectionSimplePresenceInterface::create();
33 simplePresenceIface->setSetPresenceCallback(Tp::memFun(this,&MockConnection::setPresenceFail));
34- simplePresenceIface->setMaxmimumStatusMessageLength(255);
35+ simplePresenceIface->setMaximumStatusMessageLength(255);
36 plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(simplePresenceIface));
37
38 // Set Presence
39@@ -445,9 +445,11 @@
40 return mCallChannels[requestedId]->baseChannel();
41 }
42
43-Tp::BaseChannelPtr MockConnection::createChannel(const QString& channelType, uint targetHandleType,
44- uint targetHandle, const QVariantMap &hints, Tp::DBusError *error)
45+Tp::BaseChannelPtr MockConnection::createChannel(const QVariantMap &request, Tp::DBusError *error)
46 {
47+ const QString channelType = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")).toString();
48+ uint targetHandleType = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")).toUInt();
49+ uint targetHandle = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")).toUInt();
50 qDebug() << "MockConnection::createChannel" << targetHandle;
51 if (mSelfPresence.type != Tp::ConnectionPresenceTypeAvailable) {
52 error->set(TP_QT_ERROR_NETWORK_ERROR, "No network available");
53@@ -455,9 +457,9 @@
54 }
55
56 if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT) {
57- return createTextChannel(targetHandleType, targetHandle, hints, error);
58+ return createTextChannel(targetHandleType, targetHandle, request, error);
59 } else if (channelType == TP_QT_IFACE_CHANNEL_TYPE_CALL) {
60- return createCallChannel(targetHandleType, targetHandle, hints, error);
61+ return createCallChannel(targetHandleType, targetHandle, request, error);
62 } else {
63 error->set(TP_QT_ERROR_NOT_IMPLEMENTED, "Channel type not available");
64 }
65@@ -474,9 +476,14 @@
66 if (!channel) {
67 // request the channel
68 Tp::DBusError error;
69+ QVariantMap request;
70 bool yours;
71 uint handle = newHandle(sender);
72- ensureChannel(TP_QT_IFACE_CHANNEL_TYPE_TEXT,Tp::HandleTypeContact, handle, yours, handle, false, QVariantMap(), &error);
73+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")] = TP_QT_IFACE_CHANNEL_TYPE_TEXT;
74+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".InitiatorHandle")] = handle;
75+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")] = Tp::HandleTypeContact;
76+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")] = handle;
77+ ensureChannel(request, yours, false, &error);
78 if(error.isValid()) {
79 qWarning() << "Error creating channel for incoming message" << error.name() << error.message();
80 return;
81@@ -562,8 +569,13 @@
82
83 mInitialCallStatus[callerId] = state;
84 mIncomingCalls.append(callerId);
85-
86- Tp::BaseChannelPtr channel = ensureChannel(TP_QT_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact, handle, yours, initiatorHandle, false, QVariantMap(), &error);
87+ QVariantMap request;
88+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType")] = TP_QT_IFACE_CHANNEL_TYPE_CALL;
89+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".InitiatorHandle")] = initiatorHandle;
90+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType")] = Tp::HandleTypeContact;
91+ request[TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")] = handle;
92+
93+ Tp::BaseChannelPtr channel = ensureChannel(request, yours, false, &error);
94 if (error.isValid() || channel.isNull()) {
95 qWarning() << "error creating the channel " << error.name() << error.message();
96 return QString();
97
98=== modified file 'tests/common/mock/connection.h'
99--- tests/common/mock/connection.h 2015-05-08 21:57:06 +0000
100+++ tests/common/mock/connection.h 2015-06-16 16:01:32 +0000
101@@ -55,8 +55,7 @@
102
103 QStringList inspectHandles(uint handleType, const Tp::UIntList& handles, Tp::DBusError *error);
104 Tp::UIntList requestHandles(uint handleType, const QStringList& identifiers, Tp::DBusError* error);
105- Tp::BaseChannelPtr createChannel(const QString& channelType, uint targetHandleType,
106- uint targetHandle, const QVariantMap& hints, Tp::DBusError *error);
107+ Tp::BaseChannelPtr createChannel(const QVariantMap& request, Tp::DBusError *error);
108 Tp::ContactAttributesMap getContactAttributes(const Tp::UIntList &handles, const QStringList &ifaces, Tp::DBusError *error);
109 uint setPresence(const QString& status, const QString& statusMessage, Tp::DBusError *error);
110 uint setPresenceFail(const QString& status, const QString& statusMessage, Tp::DBusError *error);
111
112=== modified file 'tests/common/mock/protocol.cpp'
113--- tests/common/mock/protocol.cpp 2015-03-27 02:47:52 +0000
114+++ tests/common/mock/protocol.cpp 2015-06-16 16:01:32 +0000
115@@ -47,5 +47,5 @@
116
117 Tp::BaseConnectionPtr Protocol::createConnection(const QVariantMap &parameters, Tp::DBusError *error) {
118 Q_UNUSED(error);
119- return Tp::BaseConnection::create<MockConnection>(QDBusConnection::sessionBus(), "mock", name().toLatin1(), parameters);
120+ return Tp::BaseConnection::create<MockConnection>("mock", name().toLatin1(), parameters);
121 }
122
123=== modified file 'tests/common/mock/textchannel.cpp'
124--- tests/common/mock/textchannel.cpp 2015-03-10 18:13:38 +0000
125+++ tests/common/mock/textchannel.cpp 2015-06-16 16:01:32 +0000
126@@ -51,8 +51,8 @@
127
128 Tp::BaseChannelPtr baseChannel = Tp::BaseChannel::create(mConnection,
129 TP_QT_IFACE_CHANNEL_TYPE_TEXT,
130- targetHandle,
131- type);
132+ type,
133+ targetHandle);
134 mBaseChannel = baseChannel;
135 Tp::BaseChannelTextTypePtr textType = Tp::BaseChannelTextType::create(baseChannel.data());
136 baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(textType));

Subscribers

People subscribed via source and target branches