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

12 files changed, 5 insertions, 11 deletions

diff --git a/protocols/MRA/proto_mra/res/Proto_MRA.rc b/protocols/MRA/proto_mra/res/Proto_MRA.rc
index 9c8b874e60..1bb939c771 100644
--- a/protocols/MRA/proto_mra/res/Proto_MRA.rc
+++ b/protocols/MRA/proto_mra/res/Proto_MRA.rc
@@ -57,6 +57,7 @@ IDI_ICON3               ICON                    "Away.ico"
 IDI_ICON4               ICON                    "Invisible.ico"

 IDI_ICON5               ICON                    "DND.ico"

 IDI_ICON6               ICON                    "FFC.ico"

+IDI_ICON7               ICON                    "Phone.ico"

 #endif    // Russian (Russia) resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/protocols/MRA/proto_mra/src/resource.h b/protocols/MRA/proto_mra/src/resource.h
index 613ef582ae..fc38bff6ce 100644
--- a/protocols/MRA/proto_mra/src/resource.h
+++ b/protocols/MRA/proto_mra/src/resource.h
@@ -8,6 +8,7 @@
 #define IDI_ICON4                       130

 #define IDI_ICON5                       158

 #define IDI_ICON6                       129

+#define IDI_ICON7                       1002

 

 // Next default values for new objects

 // 

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

 };

 

diff --git a/protocols/MRA/xstatus_MRA/res/24.ico b/protocols/MRA/xstatus_MRA/res/24.ico
index d4da7ae9bf..1799d2d8bc 100644
--- a/protocols/MRA/xstatus_MRA/res/24.ico
+++ b/protocols/MRA/xstatus_MRA/res/24.ico
diff --git a/protocols/MRA/xstatus_MRA/res/26.ico b/protocols/MRA/xstatus_MRA/res/26.ico
index 40256cbb2c..8d9cd9359f 100644
--- a/protocols/MRA/xstatus_MRA/res/26.ico
+++ b/protocols/MRA/xstatus_MRA/res/26.ico
diff --git a/protocols/MRA/xstatus_MRA/res/27.ico b/protocols/MRA/xstatus_MRA/res/27.ico
index 4374978d3a..17a7b5fc5a 100644
--- a/protocols/MRA/xstatus_MRA/res/27.ico
+++ b/protocols/MRA/xstatus_MRA/res/27.ico
diff --git a/protocols/MRA/xstatus_MRA/res/28.ico b/protocols/MRA/xstatus_MRA/res/28.ico
index 0811715083..3674a2fbc3 100644
--- a/protocols/MRA/xstatus_MRA/res/28.ico
+++ b/protocols/MRA/xstatus_MRA/res/28.ico
diff --git a/protocols/MRA/xstatus_MRA/res/9.ico b/protocols/MRA/xstatus_MRA/res/9.ico
index 8286c6f576..a4e632672b 100644
--- a/protocols/MRA/xstatus_MRA/res/9.ico
+++ b/protocols/MRA/xstatus_MRA/res/9.ico
diff --git a/protocols/MRA/xstatus_MRA/res/mobile.ico b/protocols/MRA/xstatus_MRA/res/mobile.ico
deleted file mode 100644
index 4bae0302f3..0000000000
--- a/protocols/MRA/xstatus_MRA/res/mobile.ico
+++ /dev/null
diff --git a/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc b/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc
index 393e8b3a9c..bff87382ba 100644
--- a/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc
+++ b/protocols/MRA/xstatus_MRA/res/xstatus_MRA.rc
@@ -76,8 +76,6 @@ IDI_XSTATUS45           ICON                    "50.ico"
 IDI_XSTATUS46           ICON                    "51.ico"

 IDI_XSTATUS47           ICON                    "52.ico"

 IDI_XSTATUS48           ICON                    "53.ico"

-IDI_XSTATUS49           ICON                    "54.ico"

-IDI_XSTATUS50           ICON                    "mobile.ico"

 IDI_XSTATUS_UNKNOWN     ICON                    "unknown.ico"

 

 /////////////////////////////////////////////////////////////////////////////