diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2013-03-24 17:41:59 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2013-03-24 17:41:59 +0000 |
| commit | b6799d30a5d38037536b9c090993343ba7e23ae0 (patch) | |
| tree | af4b536f8fe9c411ed27729ee66d434a0395e864 | |
| parent | c1b07589623a9d8401982e10a38faaddecd42496 (diff) | |
jabber now uses status description from the core
git-svn-id: http://svn.miranda-ng.org/main/trunk@4173 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/JabberG/src/jabber_svc.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index af28a302d2..0e1e12c2b2 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -371,12 +371,6 @@ INT_PTR __cdecl CJabberProto::ServiceSendXML(WPARAM, LPARAM lParam) static const TCHAR * JabberEnum2AffilationStr[]={ _T("None"), _T("Outcast"), _T("Member"), _T("Admin"), _T("Owner") };
static const TCHAR * JabberEnum2RoleStr[]={ _T("None"), _T("Visitor"), _T("Participant"), _T("Moderator") };
-//FIXME Table conversion fast but is not safe
-static const TCHAR * JabberEnum2StatusStr[]= { _T("Offline"), _T("Online"), _T("Away"), _T("DND"),
- _T("NA"), _T("Occupied"), _T("Free for chat"),
- _T("Invisible"), _T("On the phone"), _T("Out to lunch"),
- _T("Idle") };
-
static void appendString(bool bIsTipper, const TCHAR *tszTitle, const TCHAR *tszValue, TCHAR* buf, size_t bufSize)
{
if (*buf) {
@@ -437,7 +431,7 @@ INT_PTR __cdecl CJabberProto::JabberGCGetToolTipText(WPARAM wParam, LPARAM lPara // status
if (info->status >= ID_STATUS_OFFLINE && info->status <= ID_STATUS_IDLE )
- appendString(bIsTipper, _T("Status:"), TranslateTS(JabberEnum2StatusStr[info->status-ID_STATUS_OFFLINE]), outBuf, SIZEOF(outBuf));
+ appendString(bIsTipper, _T("Status:"), (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,info->status,GSMDF_TCHAR), outBuf, SIZEOF(outBuf));
// status text
if (info->statusMessage)
|