diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-02 09:26:31 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-02 09:26:31 +0000 |
| commit | 5abedf89d15719fb5e2ba394363ad85264ac2f58 (patch) | |
| tree | 3e2ef29c0621b58aa2be4a4397885642d7da3a60 /protocols/MRA/src | |
| parent | 549f44877c47973ba428f5cc0ad51e61f8a972da (diff) | |
the better way of processing MRA Mobile status (patch by Thug, modified)
git-svn-id: http://svn.miranda-ng.org/main/trunk@7999 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src')
| -rw-r--r-- | protocols/MRA/src/MraConstans.h | 5 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_proto.cpp | 4 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_svcs.cpp | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index d24733e4e1..c480cfcd75 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -229,9 +229,8 @@ extern const LPSTR lpcszStatusUri[]; extern const LPWSTR lpcszXStatusNameDef[];
#define MRA_XSTATUS_MENU "/menuXStatus"
-#define MRA_XSTATUS_COUNT 51
+#define MRA_XSTATUS_COUNT 49
#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
@@ -240,7 +239,7 @@ extern const LPWSTR lpcszXStatusNameDef[]; #define MRA_XSTATUS_INVISIBLE 3
#define MRA_XSTATUS_DND 4
#define MRA_XSTATUS_CHAT 5
-#define MRA_XSTATUS_MOBILE 55
+#define MRA_XSTATUS_MOBILE 54
#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 b9e40e8424..91f9578d44 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -1884,9 +1884,7 @@ 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_MOBILE: return ID_STATUS_ONTHEPHONE;
case MRA_XSTATUS_UNKNOWN:
if (pdwXStatusMir) *pdwXStatusMir = MRA_MIR_XSTATUS_UNKNOWN;
return ID_STATUS_ONLINE;
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index e32e3b4d82..50f8923fbd 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -59,7 +59,6 @@ const LPSTR lpcszStatusUri[] = "status_51",
"status_52",
"status_53",
- "status_dating",
"status_mobile",
NULL
};
@@ -115,8 +114,6 @@ const LPWSTR lpcszXStatusNameDef[] = LPGENT("Squirrel"),
LPGENT("Star"),
LPGENT("Music"),
- LPGENT("Dating"),
- LPGENT("Mobile"),
NULL
};
|