From e808982b472d53c96b3c5a1e708a4e7f4f7c6d11 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 29 Jan 2014 16:28:01 +0000 Subject: fix for unknown xstatus in MRA git-svn-id: http://svn.miranda-ng.org/main/trunk@7951 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/MraConstans.h | 4 +++- protocols/MRA/src/Mra_proto.cpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index 7bd8ece264..d24733e4e1 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -231,6 +231,7 @@ extern const LPWSTR lpcszXStatusNameDef[]; #define MRA_XSTATUS_MENU "/menuXStatus" #define MRA_XSTATUS_COUNT 51 #define MRA_MIR_XSTATUS_NONE 0 +#define MRA_MIR_XSTATUS_MOBILE 50 #define MRA_MIR_XSTATUS_UNKNOWN MRA_XSTATUS_COUNT #define MRA_XSTATUS_OFFLINE 0 @@ -239,7 +240,8 @@ extern const LPWSTR lpcszXStatusNameDef[]; #define MRA_XSTATUS_INVISIBLE 3 #define MRA_XSTATUS_DND 4 #define MRA_XSTATUS_CHAT 5 -#define MRA_XSTATUS_UNKNOWN 55 +#define MRA_XSTATUS_MOBILE 55 +#define MRA_XSTATUS_UNKNOWN 100 #define MRA_XSTATUS_INDEX_OFFSET 6 diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 1ef3f495af..b9e40e8424 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -1884,6 +1884,9 @@ DWORD GetMirandaStatusFromMraStatus(DWORD dwMraStatus, DWORD dwXStatusMra, DWORD switch (dwXStatusMra) { case MRA_XSTATUS_DND: return ID_STATUS_DND; case MRA_XSTATUS_CHAT: return ID_STATUS_FREECHAT; + case MRA_XSTATUS_MOBILE: + if (pdwXStatusMir) *pdwXStatusMir = MRA_MIR_XSTATUS_MOBILE; + return ID_STATUS_ONLINE; case MRA_XSTATUS_UNKNOWN: if (pdwXStatusMir) *pdwXStatusMir = MRA_MIR_XSTATUS_UNKNOWN; return ID_STATUS_ONLINE; -- cgit v1.2.3