summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-12-30 14:58:23 -0200
committerAndre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>2010-12-30 14:58:23 -0200
commit284b22eb721e3f99a2e927b4aec874364f7d952b (patch)
tree3e455212eae86372248a88e1dcce31e5f8219f5c
parent6e42077552bb3a4603764679da70f6a8694c22fb (diff)
Contact: publish/subscription state is known unless they are set to SubscriptionStateUnknown.
-rw-r--r--TelepathyQt4/contact.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/TelepathyQt4/contact.cpp b/TelepathyQt4/contact.cpp
index 9fec5742..094d7c8a 100644
--- a/TelepathyQt4/contact.cpp
+++ b/TelepathyQt4/contact.cpp
@@ -395,8 +395,7 @@ PendingContactInfo *Contact::requestInfo()
bool Contact::isSubscriptionStateKnown() const
{
- return (mPriv->subscriptionState != SubscriptionStateUnknown &&
- mPriv->subscriptionState != SubscriptionStateRemovedRemotely);
+ return mPriv->subscriptionState != SubscriptionStateUnknown;
}
bool Contact::isSubscriptionRejected() const
@@ -411,8 +410,7 @@ Contact::PresenceState Contact::subscriptionState() const
bool Contact::isPublishStateKnown() const
{
- return (mPriv->publishState != SubscriptionStateUnknown &&
- mPriv->publishState != SubscriptionStateRemovedRemotely);
+ return mPriv->publishState != SubscriptionStateUnknown;
}
bool Contact::isPublishCancelled() const