diff options
author | George Hazan <george.hazan@gmail.com> | 2013-07-20 14:23:07 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-07-20 14:23:07 +0000 |
commit | 5e4286f1becfb5ce52372f882a51ae8ea6f6ef6d (patch) | |
tree | 60e5dc3d3fa347ba34e1447e6b6e925c0e33c29b /protocols/JabberG/src/jabber_list.h | |
parent | d7382326906b9f3bdd66704dd1b41f9299c1daa6 (diff) |
- Jabber resource fix: in LAST_SEEN mode resource is skipped when no sessions were available;
- code cleanup;
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@5429 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_list.h')
-rw-r--r-- | protocols/JabberG/src/jabber_list.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h index 7a4cf77a27..b73c09bf49 100644 --- a/protocols/JabberG/src/jabber_list.h +++ b/protocols/JabberG/src/jabber_list.h @@ -105,7 +105,7 @@ struct JABBER_RESOURCE_STATUS JABBER_XEP0232_SOFTWARE_INFO* pSoftwareInfo;
};
-struct JABBER_LIST_ITEM
+struct JABBER_LIST_ITEM : public MZeroedObject
{
JABBER_LIST list;
TCHAR* jid;
@@ -113,13 +113,16 @@ struct JABBER_LIST_ITEM // LIST_ROSTER
// jid = jid of the contact
TCHAR* nick;
+
+ JABBER_RESOURCE_STATUS* getBestResource() const;
+ JABBER_RESOURCE_MODE resourceMode;
int resourceCount;
JABBER_RESOURCE_STATUS
*pResources, // array of resources
*pLastSeenResource, // resource which was last seen active
*pManualResource, // manually set resource
itemResource; // resource for jids without /resource node
- JABBER_RESOURCE_MODE resourceMode;
+
JABBER_SUBSCRIPTION subscription;
TCHAR* group;
TCHAR* photoFileName;
|