[telepathy-qt4/master] ContactManager: Follow name convention when dealing with contact lists channels.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Tue Jul 21 23:14:17 PDT 2009


---
 TelepathyQt4/connection.cpp      |    2 +-
 TelepathyQt4/contact-manager.cpp |    2 +-
 TelepathyQt4/contact-manager.h   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TelepathyQt4/connection.cpp b/TelepathyQt4/connection.cpp
index 3e4c873..bccdf9c 100644
--- a/TelepathyQt4/connection.cpp
+++ b/TelepathyQt4/connection.cpp
@@ -991,7 +991,7 @@ void Connection::contactListChannelReady()
     if (++mPriv->contactListsChannelsReady ==
             ContactManager::ContactListChannel::LastType) {
         debug() << "FeatureRoster ready";
-        mPriv->contactManager->setContactListChannels(mPriv->contactListsChannels);
+        mPriv->contactManager->setContactListsChannels(mPriv->contactListsChannels);
         mPriv->readinessHelper->setIntrospectCompleted(FeatureRoster, true);
     }
 }
diff --git a/TelepathyQt4/contact-manager.cpp b/TelepathyQt4/contact-manager.cpp
index 052bced..09bc987 100644
--- a/TelepathyQt4/contact-manager.cpp
+++ b/TelepathyQt4/contact-manager.cpp
@@ -718,7 +718,7 @@ ContactPtr ContactManager::ensureContact(const ReferencedHandles &handle,
     return contact;
 }
 
-void ContactManager::setContactListChannels(
+void ContactManager::setContactListsChannels(
         const QMap<uint, ContactListChannel> &contactListsChannels)
 {
     Q_ASSERT(mPriv->contactListsChannels.isEmpty());
diff --git a/TelepathyQt4/contact-manager.h b/TelepathyQt4/contact-manager.h
index ffa9ee3..58f8634 100644
--- a/TelepathyQt4/contact-manager.h
+++ b/TelepathyQt4/contact-manager.h
@@ -166,7 +166,7 @@ private:
             const QSet<Contact::Feature> &features,
             const QVariantMap &attributes);
 
-    void setContactListChannels(
+    void setContactListsChannels(
             const QMap<uint, ContactListChannel> &contactListsChannels);
 
     struct Private;
-- 
1.5.6.5




More information about the telepathy-commits mailing list