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_proto.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_proto.h')
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 319a2a4b32..93bbe613cd 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -655,7 +655,6 @@ struct CJabberProto : public PROTO<CJabberProto> JABBER_RESOURCE_STATUS *CJabberProto::ListFindResource(JABBER_LIST list, const TCHAR *jid);
int ListAddResource(JABBER_LIST list, const TCHAR *jid, int status, const TCHAR *statusMessage, char priority = 0, const TCHAR *nick = NULL);
void ListRemoveResource(JABBER_LIST list, const TCHAR *jid);
- TCHAR* ListGetBestResourceNamePtr(const TCHAR *jid);
TCHAR* ListGetBestClientResourceNamePtr(const TCHAR *jid);
void SetMucConfig(HXML node, void *from);
@@ -877,9 +876,12 @@ struct CJabberProto : public PROTO<CJabberProto> void SendPresenceTo(int status, TCHAR* to, HXML extra, const TCHAR *msg = NULL);
void SendPresence(int m_iStatus, bool bSendToAll);
void StringAppend(char* *str, int *sizeAlloced, const char* fmt, ...);
- TCHAR* GetClientJID(const TCHAR *jid, TCHAR*, size_t);
void RebuildInfoFrame(void);
+ // returns buf or NULL on error
+ TCHAR* GetClientJID(HANDLE hContact, TCHAR *dest, size_t destLen);
+ TCHAR* GetClientJID(const TCHAR *jid, TCHAR *dest, size_t destLen);
+
void ComboLoadRecentStrings(HWND hwndDlg, UINT idcCombo, char *param, int recentCount=JABBER_DEFAULT_RECENT_COUNT);
void ComboAddRecentString(HWND hwndDlg, UINT idcCombo, char *param, TCHAR *string, int recentCount=JABBER_DEFAULT_RECENT_COUNT);
BOOL EnterString(TCHAR *result, size_t resultLen, TCHAR *caption=NULL, int type=0, char *windowName=NULL, int recentCount=JABBER_DEFAULT_RECENT_COUNT, int timeout=0);
|