diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-05-16 14:02:15 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-05-16 15:03:28 -0300 |
| commit | e100b21206fbb9c65e4bdc1a1d2d79ce377e428b (patch) | |
| tree | 8ad3ff3f6c03d75532aca728d8777bbaafdcb48c | |
| parent | e8aa53d9991fca400b131319c7e75f6770f27486 (diff) | |
Message: Change hasError to isError.
| -rw-r--r-- | TelepathyQt4/message.cpp | 5 | ||||
| -rw-r--r-- | TelepathyQt4/message.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/TelepathyQt4/message.cpp b/TelepathyQt4/message.cpp index 9b8ee7bc..c891df78 100644 --- a/TelepathyQt4/message.cpp +++ b/TelepathyQt4/message.cpp @@ -517,12 +517,13 @@ QString ReceivedMessage::DeliveryDetails::token() const return stringOrEmptyFromPart(mPriv->parts, 0, "delivery-token"); } -bool ReceivedMessage::DeliveryDetails::hasError() const +bool ReceivedMessage::DeliveryDetails::isError() const { if (!isValid()) { return false; } - return partContains(mPriv->parts, 0, "delivery-error"); + DeliveryStatus st(status()); + return st == DeliveryStatusTemporarilyFailed || st == DeliveryStatusPermanentlyFailed; } ChannelTextSendError ReceivedMessage::DeliveryDetails::error() const diff --git a/TelepathyQt4/message.h b/TelepathyQt4/message.h index 6af52d40..729cadc6 100644 --- a/TelepathyQt4/message.h +++ b/TelepathyQt4/message.h @@ -114,7 +114,7 @@ public: bool hasToken() const; QString token() const; - bool hasError() const; + bool isError() const; ChannelTextSendError error() const; bool hasErrorMessage() const; |