[Telepathy-commits] [telepathy-qt4/master] Misc Will-review fixes to group handle owners
Olli Salli
olli.salli at collabora.co.uk
Mon Oct 13 14:09:26 PDT 2008
---
TelepathyQt4/cli-channel.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/TelepathyQt4/cli-channel.cpp b/TelepathyQt4/cli-channel.cpp
index 25079d1..d8dabfe 100644
--- a/TelepathyQt4/cli-channel.cpp
+++ b/TelepathyQt4/cli-channel.cpp
@@ -654,7 +654,7 @@ void Channel::gotAllMembers(QDBusPendingCallWatcher* watcher)
mPriv->groupHaveMembers = true;
mPriv->groupMembers = QSet<uint>::fromList(reply.argumentAt<0>());
- mPriv->groupRemotePending= QSet<uint>::fromList(reply.argumentAt<2>());
+ mPriv->groupRemotePending = QSet<uint>::fromList(reply.argumentAt<2>());
foreach (uint handle, QSet<uint>::fromList(reply.argumentAt<1>())) {
mPriv->groupLocalPending[handle] = GroupMemberChangeInfo();
@@ -822,9 +822,9 @@ void Channel::onHandleOwnersChanged(const Telepathy::HandleOwnerMap& added, cons
uint global = i.value();
if (!mPriv->groupHandleOwners.contains(handle)
- || mPriv->groupHandleOwners[handle]) {
+ || mPriv->groupHandleOwners[handle] != global) {
debug() << " +++/changed" << handle << "->" << global;
- mPriv->groupHandleOwners[global] = global;
+ mPriv->groupHandleOwners[handle] = global;
emitAdded.append(handle);
}
}
--
1.5.6.5
More information about the Telepathy-commits
mailing list