Commit b54ac099 authored by Rafał Malinowski's avatar Rafał Malinowski

avatar: remove unneccessary workaround

Signed-off-by: Rafał Malinowski's avatarRafał Malinowski <rafal.przemyslaw.malinowski@gmail.com>
parent 50048d0b
......@@ -212,7 +212,7 @@ Avatar AvatarManager::byBuddy(Buddy buddy, NotFoundAction action)
Avatar AvatarManager::byContact(Contact contact, NotFoundAction action)
{
if (contact.contactAvatar() && (contact.contactAvatar().state() == StorableObject::StateLoaded))
if (contact.contactAvatar())
return contact.contactAvatar();
if (ActionReturnNull == action)
......
......@@ -76,7 +76,6 @@ void Avatar::storeAvatar()
data()->storeAvatar();
}
KaduSharedBase_PropertyReadDef(Avatar, StorableObject::StorableObjectState, state, State, StorableObject::StateNew)
KaduSharedBase_PropertyBoolReadDef(Avatar, Empty, true)
KaduSharedBase_PropertyDefCRW(Avatar, QDateTime, lastUpdated, LastUpdated, QDateTime())
KaduSharedBase_PropertyDefCRW(Avatar, QDateTime, nextUpdate, NextUpdate, QDateTime())
......
......@@ -52,7 +52,6 @@ public:
virtual void storeAvatar();
KaduSharedBase_PropertyRead(StorableObject::StorableObjectState, state, State)
KaduSharedBase_PropertyBoolRead(Empty)
KaduSharedBase_PropertyCRW(QDateTime, lastUpdated, LastUpdated)
KaduSharedBase_PropertyCRW(QDateTime, nextUpdate, NextUpdate)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment