[Telepathy-commits] [telepathy-qt4/master] Oggis-review: Fix groupSelfRemoveInfo() to only work in ReadinessClosed and update APIDocs to indicate that.

[George Goldberg]

---
 TelepathyQt4/cli-channel.cpp |    4 ++--
 TelepathyQt4/cli-channel.h   |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TelepathyQt4/cli-channel.cpp b/TelepathyQt4/cli-channel.cpp
index a8a1c29..0d36c42 100644
--- a/TelepathyQt4/cli-channel.cpp
+++ b/TelepathyQt4/cli-channel.cpp
@@ -552,8 +552,8 @@ uint Channel::groupSelfHandle() const
 
 Channel::GroupMemberChangeInfo Channel::groupSelfRemoveInfo() const
 {
-    if (mPriv->readiness != ReadinessFull)
-        warning() << "Channel::groupSelfRemoveInfo() used with readiness" << mPriv->readiness << "!= ReadinessFull";
+    if (mPriv->readiness != ReadinessClosed)
+        warning() << "Channel::groupSelfRemoveInfo() used with readiness" << mPriv->readiness << "!= ReadinessClosed;
     else if (!mPriv->interfaces.contains(TELEPATHY_INTERFACE_CHANNEL_INTERFACE_GROUP))
         warning() << "Channel::groupSelfRemoveInfo() used with no group interface";
 
diff --git a/TelepathyQt4/cli-channel.h b/TelepathyQt4/cli-channel.h
index e9ac04e..b8bfee4 100644
--- a/TelepathyQt4/cli-channel.h
+++ b/TelepathyQt4/cli-channel.h
@@ -210,10 +210,10 @@ public Q_SLOTS:
      * in either the ReadinessDead or ReadinessClosed state, a DBus error of type
      * TELEPATHY_ERROR_NOT_AVAILABLE will be returned.
      *
-     * If the introspection of a channel is not complete when close() is called,
-     * the channel readiness will change to ReadinessDead instead of
-     * ReadinessClosed, which results if the channel is closed after the
-     * introspection is complete.
+     * If the introspection of a channel is not complete (ReadinessJustCreated)
+     * when close() is called, the channel readiness will change to ReadinessDead
+     * instead of ReadinessClosed, which results if the channel is closed after
+     * the introspection is complete (ReadinessFull).
      *
      * \return QDBusPendingReply object for the call to Close() on the Channel
      *         interface.
@@ -439,8 +439,8 @@ public:
      * the user hasn't been removed from the group, an object for which
      * GroupMemberChangeInfo::isValid() returns <code>false</code> is returned.
      *
-     * This method works even when the channel has gone into readiness
-     * #ReadinessDead or #ReadinessClosed. This is useful for getting the
+     * This method only after the channel has gone into readiness
+     * #ReadinessClosed. This is useful for getting the
      * remove information after missing the corresponding groupMembersChanged()
      * (or groupLocalPendingChanged()/groupRemotePendingChanged()) signal, as
      * the local user being removed usually causes the remote %Channel to be
-- 
1.5.6.5