MRA

+ Add: hidden option "xStatusShowAll" to allow select x-status Dating
* Fix: Blog status icon does not display
* Fix: SetContactStatus for contacts without authorization on user info update* code cleanup




git-svn-id: http://svn.miranda-ng.org/main/trunk@8445 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 139 insertions, 141 deletions

diff --git a/protocols/MRA/src/proto.h b/protocols/MRA/src/proto.h
index 9bcce264ef..c089cabe08 100644
--- a/protocols/MRA/src/proto.h
+++ b/protocols/MRA/src/proto.h
@@ -16,11 +16,11 @@ typedef struct mrim_packet_header_t
     u_long      seq;		// Sequence

     u_long      msg;		// Тип пакета

     u_long      dlen; 		// Длина данных

-    u_char		reserved[24];	// Зарезервировано

+    u_char	reserved[24];	// Зарезервировано

 }

 mrim_packet_header_t;

 

-#define CS_MAGIC    0xDEADBEEF		// Клиентский Magic ( C <-> S )

+#define CS_MAGIC    0xDEADBEEF	// Клиентский Magic ( C <-> S )

 

 

 // UNICODE = (UTF-16LE) ( >= 1.17)

@@ -31,115 +31,113 @@ mrim_packet_header_t;
 

  ***************************************************************************/

 

-#define MRIM_CS_HELLO       	0x1001  // C -> S

+#define MRIM_CS_HELLO       		0x1001 // C->S

 // empty

 

-#define MRIM_CS_HELLO_ACK   	0x1002  // S -> C

+#define MRIM_CS_HELLO_ACK   		0x1002 // S->C

 // mrim_connection_params_t

 

 

-#define MRIM_CS_LOGIN_ACK   	0x1004  // S -> C

+#define MRIM_CS_LOGIN_ACK   		0x1004 // S->C

 // empty

 

-#define MRIM_CS_LOGIN_REJ   	0x1005  // S -> C

+#define MRIM_CS_LOGIN_REJ   		0x1005 // S->C

 // LPS reason ???

 

-#define MRIM_CS_PING        	0x1006  // C -> S

+#define MRIM_CS_PING        		0x1006 // C->S

 // empty

 

-#define MRIM_CS_MESSAGE			0x1008  // C -> S

+#define MRIM_CS_MESSAGE			0x1008 // C->S

 // UL flags

 	#define MESSAGE_FLAG_OFFLINE		0x00000001

-	#define MESSAGE_FLAG_NORECV			0x00000004

-	#define MESSAGE_FLAG_AUTHORIZE		0x00000008 	// X-MRIM-Flags: 00000008

-	#define MESSAGE_FLAG_SYSTEM			0x00000040

-	#define MESSAGE_FLAG_RTF			0x00000080

+	#define MESSAGE_FLAG_NORECV		0x00000004

+	#define MESSAGE_FLAG_AUTHORIZE		0x00000008 // X-MRIM-Flags: 00000008

+	#define MESSAGE_FLAG_SYSTEM		0x00000040

+	#define MESSAGE_FLAG_RTF		0x00000080

 	#define MESSAGE_FLAG_CONTACT		0x00000200

-	#define MESSAGE_FLAG_NOTIFY			0x00000400

-	#define MESSAGE_FLAG_SMS			0x00000800

+	#define MESSAGE_FLAG_NOTIFY		0x00000400

+	#define MESSAGE_FLAG_SMS		0x00000800

 	#define MESSAGE_FLAG_MULTICAST		0x00001000

 	#define MESSAGE_SMS_DELIVERY_REPORT	0x00002000

-	#define MESSAGE_FLAG_ALARM			0x00004000

-	#define MESSAGE_FLAG_FLASH			0x00008000

-	#define MESSAGE_FLAG_SPAMF_SPAM		0x00020000  // report spam back to the server

-	#define MESSAGE_FLAG_MULTICHAT		0x00400000	//

-		#define MULTICHAT_MESSAGE		0	// received message (s->c)

+	#define MESSAGE_FLAG_ALARM		0x00004000

+	#define MESSAGE_FLAG_FLASH		0x00008000

+	#define MESSAGE_FLAG_SPAMF_SPAM		0x00020000 // report spam back to the server

+	#define MESSAGE_FLAG_MULTICHAT		0x00400000 //

+		#define MULTICHAT_MESSAGE	0	// received message (s->c)

 		#define MULTICHAT_GET_MEMBERS	1	// request members list from server (c->s)

-		#define MULTICHAT_MEMBERS		2	// members list from server (s->c)

+		#define MULTICHAT_MEMBERS	2	// members list from server (s->c)

 		#define MULTICHAT_ADD_MEMBERS	3	//

-		#define MULTICHAT_ATTACHED		4	// user joined to chat (s->c)

-		#define MULTICHAT_DETACHED		5	// user leave chat (s->c)

-		#define MULTICHAT_DESTROYED		6	//

-		#define MULTICHAT_INVITE		7	//

-	#define MESSAGE_FLAG_v1p16			0x00100000	// для перекодировки юникода

-	#define MESSAGE_FLAG_CP1251			0x00200000

+		#define MULTICHAT_ATTACHED	4	// user joined to chat (s->c)

+		#define MULTICHAT_DETACHED	5	// user leave chat (s->c)

+		#define MULTICHAT_DESTROYED	6	//

+		#define MULTICHAT_INVITE	7	//

+	#define MESSAGE_FLAG_v1p16		0x00100000 // для перекодировки юникода

+	#define MESSAGE_FLAG_CP1251		0x00200000

 // LPS to e-mail ANSI

 // LPS message ANSI/UNICODE (see flags)

 // LPS rtf-formatted message ( >= 1.1) ???

 // LPS multichat_data ( >= 1.20) ???

 

 #define MAX_MULTICAST_RECIPIENTS 50

-	#define MESSAGE_USERFLAGS_MASK	0x000036A8	// Flags that user is allowed to set himself

+	#define MESSAGE_USERFLAGS_MASK	0x000036A8 // Flags that user is allowed to set himself

 

 

-#define MRIM_CS_MESSAGE_ACK		0x1009  // S -> C

+#define MRIM_CS_MESSAGE_ACK		0x1009 // S->C

 // UL msg_id

 // UL flags

 // LPS from e-mail ANSI

 // LPS message UNICODE

 // LPS rtf-formatted message ( >= 1.1)	- MESSAGE_FLAG_RTF

-//		//BASE64(						- MESSAGE_FLAG_AUTHORIZE

-//				UL parts count = 2

-//				LPS auth_sender_nick  UNICODE

-//				LPS auth_request_text  UNICODE

-//[ LPS multichat_data ] ( >=  1.20) - MESSAGE_FLAG_MULTICHAT

-//				UL type

-//				LPS multichat_name

-//				switch (type) {

-//					MULTICHAT_MESSAGE {

-//						LPS sender ANSI

-//					}

-//					MULTICHAT_MEMBERS {

-//						CLPS members

-//						[ LPS owner ]

-//					}

-//					MULTICHAT_ADD_MEMBERS {

-//						LPS sender ANSI

-//						CLPS members

-//					}

-//					MULTICHAT_ATTACHED {

-//						LPS member ANSI

-//					}

-//					MULTICHAT_DETACHED {

-//						LPS member ANSI

-//					}

-//					MULTICHAT_INVITE {

-//						LPS sender ANSI

-//					}

-//				}

+//	BASE64(				- MESSAGE_FLAG_AUTHORIZE

+//		UL parts count = 2

+//		LPS auth_sender_nick  UNICODE

+//		LPS auth_request_text  UNICODE

+//[ LPS multichat_data ] ( >=  1.20)	- MESSAGE_FLAG_MULTICHAT

+//		UL type

+//		LPS multichat_name

+//		switch (type) {

+//			MULTICHAT_MESSAGE {

+//				LPS sender ANSI

+//			}

+//			MULTICHAT_MEMBERS {

+//				CLPS members

+//				[ LPS owner ]

+//			}

+//			MULTICHAT_ADD_MEMBERS {

+//				LPS sender ANSI

+//				CLPS members

+//			}

+//			MULTICHAT_ATTACHED {

+//				LPS member ANSI

+//			}

+//			MULTICHAT_DETACHED {

+//				LPS member ANSI

+//			}

+//			MULTICHAT_INVITE {

+//				LPS sender ANSI

+//			}

+//		}

 //	)

 

 

 

 

 

-#define MRIM_CS_MESSAGE_RECV	0x1011	// C -> S

+#define MRIM_CS_MESSAGE_RECV		0x1011 // C->S

 // LPS from e-mail ANSI

 // UL msg_id

 

-#define MRIM_CS_MESSAGE_STATUS	0x1012	// S -> C

+#define MRIM_CS_MESSAGE_STATUS		0x1012 // S->C

 // UL status

-	#define MESSAGE_DELIVERED				0x0000	// Message delivered directly to user

-	#define MESSAGE_REJECTED_NOUSER			0x8001  // Message rejected - no such user

-	#define MESSAGE_REJECTED_INTERR			0x8003	// Internal server error

+	#define MESSAGE_DELIVERED		0x0000	// Message delivered directly to user

+	#define MESSAGE_REJECTED_NOUSER		0x8001  // Message rejected - no such user

+	#define MESSAGE_REJECTED_INTERR		0x8003	// Internal server error

 	#define MESSAGE_REJECTED_LIMIT_EXCEEDED	0x8004	// Offline messages limit exceeded

-	#define MESSAGE_REJECTED_TOO_LARGE		0x8005	// Message is too large

+	#define MESSAGE_REJECTED_TOO_LARGE	0x8005	// Message is too large

 	#define	MESSAGE_REJECTED_DENY_OFFMSG	0x8006	// User does not accept offline messages

 	#define	MESSAGE_REJECTED_DENY_OFFFLSH	0x8007	// User does not accept offline flash animation

-	//#define	MESSAGE_REJECTED_DENY_OFFFLSH	0x8008	// User does not accept offline flash animation

-	//#define	MESSAGE_REJECTED_DENY_OFFFLSH	0x8009	// User does not accept offline flash animation

 

-#define MRIM_CS_USER_STATUS     0x100F  // S -> C

+#define MRIM_CS_USER_STATUS		0x100F // S->C

 // UL status

 	#define STATUS_OFFLINE          0x00000000

 	#define STATUS_ONLINE           0x00000001

@@ -184,14 +182,14 @@ mrim_packet_header_t;
 	//  "protocol" - MMP protocol number by format "<major>.<minor>".

 

 

-#define MRIM_CS_LOGOUT			0x1013	// S -> C

+#define MRIM_CS_LOGOUT			0x1013 // S->C

 // UL reason

-	#define LOGOUT_NO_RELOGIN_FLAG	0x0010		// Logout due to double login

+	#define LOGOUT_NO_RELOGIN_FLAG	0x0010 // Logout due to double login

 

-#define MRIM_CS_CONNECTION_PARAMS	0x1014	// S -> C (>1.16 depricated ?)

+#define MRIM_CS_CONNECTION_PARAMS	0x1014 // S->C (>1.16 depricated ?)

 // mrim_connection_params_t

 

-#define MRIM_CS_USER_INFO			0x1015	// S -> C

+#define MRIM_CS_USER_INFO		0x1015 // S->C

 // (LPS key, LPS value)* X ???

 // MESSAGES.TOTAL - num UNICODE

 // MESSAGES.UNREAD - num UNICODE

@@ -199,53 +197,53 @@ mrim_packet_header_t;
 // client.endpoint - ip:port UNICODE

 

 

-#define MRIM_CS_ADD_CONTACT			0x1019	// C -> S

+#define MRIM_CS_ADD_CONTACT		0x1019 // C->S

 // UL flags (group(2) or usual(0)

 	#define CONTACT_FLAG_REMOVED		0x00000001

-	#define CONTACT_FLAG_GROUP			0x00000002

+	#define CONTACT_FLAG_GROUP		0x00000002

 	#define CONTACT_FLAG_INVISIBLE		0x00000004

 	#define CONTACT_FLAG_VISIBLE		0x00000008

-	#define CONTACT_FLAG_IGNORE			0x00000010

-	#define CONTACT_FLAG_SHADOW			0x00000020

+	#define CONTACT_FLAG_IGNORE		0x00000010

+	#define CONTACT_FLAG_SHADOW		0x00000020

 	#define CONTACT_FLAG_AUTHORIZED		0x00000040 // ( >= 1.15)

-	#define CONTACT_FLAG_MULTICHAT		0x00000080 // ( >= 1.20)  = 128

-	#define CONTACT_FLAG_UNICODE_NAME	0x00000200 //  = 512

-	#define CONTACT_FLAG_PHONE			0x00100000

+	#define CONTACT_FLAG_MULTICHAT		0x00000080 // ( >= 1.20) = 128

+	#define CONTACT_FLAG_UNICODE_NAME	0x00000200 // = 512

+	#define CONTACT_FLAG_PHONE		0x00100000

 

 // UL group id (unused if contact is group)

 // LPS contact e-mail ANSI

 // LPS name UNICODE

 // LPS custom phones ANSI

 // LPS BASE64(

-//				UL parts count = 2

-//				LPS auth_sender_nick ???

-//				LPS auth_request_text ???

+//		UL parts count = 2

+//		LPS auth_sender_nick ???

+//		LPS auth_request_text ???

 //	)

 // UL actions ( >= 1.15)

 // [LPS multichat_data]

 //		CLPS members ( >=  1.20)

 //		[ LPS owner ]

     #define ADD_CONTACT_FLAG_MYMAIL_INVITE		0x00000001

-    #define ADD_CONTACT_FLAG_MULTICHAT_ATTACHE	0x00000002

+    #define ADD_CONTACT_FLAG_MULTICHAT_ATTACHE		0x00000002

 	//used internal in win32 agent

 	#define CONTACT_AWAITING_AUTHORIZATION_USER	0x00000100

-	#define CONTACT_FLAG_TEMPORARY				0x00010000

+	#define CONTACT_FLAG_TEMPORARY			0x00010000

 

 

-#define MRIM_CS_ADD_CONTACT_ACK			0x101A	// S -> C

+#define MRIM_CS_ADD_CONTACT_ACK		0x101A // S->C

 // UL status

 	#define CONTACT_OPER_SUCCESS		0x0000

-	#define CONTACT_OPER_ERROR			0x0001

-	#define CONTACT_OPER_INTERR			0x0002

+	#define CONTACT_OPER_ERROR		0x0001

+	#define CONTACT_OPER_INTERR		0x0002

 	#define CONTACT_OPER_NO_SUCH_USER	0x0003

 	#define CONTACT_OPER_INVALID_INFO	0x0004

 	#define CONTACT_OPER_USER_EXISTS	0x0005

-	#define CONTACT_OPER_GROUP_LIMIT	0x6

+	#define CONTACT_OPER_GROUP_LIMIT	0x0006

 // UL contact_id or (u_long)-1 if status is not OK

 // [LPS multichat_contact ( >=  1.20)]

 

 

-#define MRIM_CS_MODIFY_CONTACT			0x101B	// C -> S

+#define MRIM_CS_MODIFY_CONTACT		0x101B // C->S

 // UL id

 // UL flags - same as for MRIM_CS_ADD_CONTACT

 // UL group id (unused if contact is group)

@@ -253,24 +251,24 @@ mrim_packet_header_t;
 // LPS name UNICODE

 // LPS custom phones ANSI

 

-#define MRIM_CS_MODIFY_CONTACT_ACK		0x101C	// S -> C

+#define MRIM_CS_MODIFY_CONTACT_ACK	0x101C // S->C

 // UL status, same as for MRIM_CS_ADD_CONTACT_ACK

 

-#define MRIM_CS_OFFLINE_MESSAGE_ACK		0x101D	// S -> C

+#define MRIM_CS_OFFLINE_MESSAGE_ACK	0x101D // S->C

 // UIDL

 // LPS offline message ???

 

-#define MRIM_CS_DELETE_OFFLINE_MESSAGE	0x101E	// C -> S

+#define MRIM_CS_DELETE_OFFLINE_MESSAGE	0x101E // C->S

 // UIDL

 

 

-#define MRIM_CS_AUTHORIZE				0x1020	// C -> S

+#define MRIM_CS_AUTHORIZE		0x1020 // C->S

 // LPS user e-mail ANSI

 

-#define MRIM_CS_AUTHORIZE_ACK			0x1021	// S -> C

+#define MRIM_CS_AUTHORIZE_ACK		0x1021 // S->C

 // LPS user e-mail ANSI

 

-#define MRIM_CS_CHANGE_STATUS			0x1022	// C -> S

+#define MRIM_CS_CHANGE_STATUS		0x1022 // C->S

 // UL new status

 // LPS spec_status_uri ANSI ( >= 1.14)

 // LPS status_title UNICODE ( >= 1.14)

@@ -278,17 +276,17 @@ mrim_packet_header_t;
 // UL com_support ( >= 1.14) (see MRIM_CS_USER_STATUS)

 

 

-#define MRIM_CS_GET_MPOP_SESSION		0x1024	// C -> S

+#define MRIM_CS_GET_MPOP_SESSION	0x1024 // C->S

 

 

-#define MRIM_CS_MPOP_SESSION			0x1025	// S -> C

+#define MRIM_CS_MPOP_SESSION		0x1025 // S->C

 // UL status

 	#define MRIM_GET_SESSION_FAIL		0

 	#define MRIM_GET_SESSION_SUCCESS	1

 // LPS mpop session ???

 

 

-#define MRIM_CS_FILE_TRANSFER			0x1026  // C->S

+#define MRIM_CS_FILE_TRANSFER		0x1026 // C->S

 // LPS TO/FROM e-mail ANSI

 // DWORD id_request - uniq per connect

 // DWORD FILESIZE

@@ -298,7 +296,7 @@ mrim_packet_header_t;
 							// Files (FileName;FileSize;FileName;FileSize;) UNICODE

 		// LPS Conn (IP:Port;IP:Port;) ANSI

 

-#define MRIM_CS_FILE_TRANSFER_ACK		0x1027 // S->C

+#define MRIM_CS_FILE_TRANSFER_ACK	0x1027 // S->C

 // DWORD status

 	#define FILE_TRANSFER_STATUS_OK                 1

 	#define FILE_TRANSFER_STATUS_DECLINE            0

@@ -312,51 +310,51 @@ mrim_packet_header_t;
 

 

 //white pages!

-#define MRIM_CS_WP_REQUEST			0x1029 //C->S

+#define MRIM_CS_WP_REQUEST		0x1029 // C->S

 // DWORD field

 // LPS value ???

-#define PARAMS_NUMBER_LIMIT			50

+#define PARAMS_NUMBER_LIMIT		50

 #define PARAM_VALUE_LENGTH_LIMIT	64

 

 //if last symbol in value eq '*' it will be replaced by LIKE '%'

 // params define

 // must be  in consecutive order (0..N) to quick check in check_anketa_info_request

 	enum {

-	MRIM_CS_WP_REQUEST_PARAM_USER		 =  0, // ANSI

+	MRIM_CS_WP_REQUEST_PARAM_USER =  0,		// ANSI

 	MRIM_CS_WP_REQUEST_PARAM_DOMAIN, 		// ANSI

 	MRIM_CS_WP_REQUEST_PARAM_NICKNAME, 		// UNICODE

 	MRIM_CS_WP_REQUEST_PARAM_FIRSTNAME, 		// UNICODE

 	MRIM_CS_WP_REQUEST_PARAM_LASTNAME, 		// UNICODE

-	MRIM_CS_WP_REQUEST_PARAM_SEX	, 		// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_SEX,	 		// ANSI

 	MRIM_CS_WP_REQUEST_PARAM_BIRTHDAY, 		// not used for search

-	MRIM_CS_WP_REQUEST_PARAM_DATE1	, 		// ANSI

-	MRIM_CS_WP_REQUEST_PARAM_DATE2	, 		// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_DATE1, 		// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_DATE2, 		// ANSI

 	//!!!!!!!!!!!!!!!!!!!online request param must be at end of request!!!!!!!!!!!!!!!

-	MRIM_CS_WP_REQUEST_PARAM_ONLINE	, 		// ANSI

-	MRIM_CS_WP_REQUEST_PARAM_STATUS	, 		// we do not used it, yet

+	MRIM_CS_WP_REQUEST_PARAM_ONLINE, 		// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_STATUS, 		// we do not used it, yet

 	MRIM_CS_WP_REQUEST_PARAM_CITY_ID, 		// ANSI

 	MRIM_CS_WP_REQUEST_PARAM_ZODIAC, 		// ANSI

-	MRIM_CS_WP_REQUEST_PARAM_BIRTHDAY_MONTH, // ANSI

-	MRIM_CS_WP_REQUEST_PARAM_BIRTHDAY_DAY, 	// ANSI

-	MRIM_CS_WP_REQUEST_PARAM_COUNTRY_ID, 	// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_BIRTHDAY_MONTH,	// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_BIRTHDAY_DAY,		// ANSI

+	MRIM_CS_WP_REQUEST_PARAM_COUNTRY_ID,		// ANSI

 	MRIM_CS_WP_REQUEST_PARAM_MAX

 	};

 

-#define MRIM_CS_ANKETA_INFO			0x1028 //S->C

+#define MRIM_CS_ANKETA_INFO		0x1028 // S->C

 // DWORD status

-	#define MRIM_ANKETA_INFO_STATUS_OK			1

+	#define MRIM_ANKETA_INFO_STATUS_OK		1

 	#define MRIM_ANKETA_INFO_STATUS_NOUSER		0

 	#define MRIM_ANKETA_INFO_STATUS_DBERR		2

 	#define MRIM_ANKETA_INFO_STATUS_RATELIMERR	3

 // DWORD fields_num

 // DWORD max_rows

 // DWORD server_time sec since 1970 (unixtime)

-	// fields set 				//%fields_num == 0

-	// values set 				//%fields_num == 0

+	// fields set 	//%fields_num == 0

+	// values set 	//%fields_num == 0

 // LPS value (numbers too) ???

 

 

-#define MRIM_CS_MAILBOX_STATUS			0x1033

+#define MRIM_CS_MAILBOX_STATUS		0x1033

 // DWORD new messages in mailbox

 

 

@@ -387,7 +385,7 @@ mrim_packet_header_t;
 

 

 

-#define MRIM_CS_CONTACT_LIST2		0x1037 //S->C

+#define MRIM_CS_CONTACT_LIST2		0x1037 // S->C

 // UL status

 	#define GET_CONTACTS_OK		0x0000

 	#define GET_CONTACTS_ERROR	0x0001

@@ -409,7 +407,7 @@ mrim_packet_header_t;
 

 

 //old packet cs_login with cs_statistic

-#define MRIM_CS_LOGIN2		0x1038  // C -> S

+#define MRIM_CS_LOGIN2			0x1038 // C->S

 // LPS login e-mail ANSI

 // LPS password ANSI

 // DWORD status

@@ -498,17 +496,17 @@ mrim_packet_header_t;
 */

 

 

-#define MRIM_CS_SMS       	0x1039  // C -> S

+#define MRIM_CS_SMS       		0x1039 // C->S

 // UL flags

 // LPS to Phone ???

 // LPS message ???

 

-#define MRIM_CS_SMS_ACK		0x1040 // S->C

+#define MRIM_CS_SMS_ACK			0x1040 // S->C

 // UL status

 

 

 

-#define MRIM_CS_PROXY		0x1044

+#define MRIM_CS_PROXY			0x1044

 // LPS          to e-mail ANSI

 // DWORD        id_request

 // DWORD        data_type

@@ -519,15 +517,15 @@ mrim_packet_header_t;
 // LPS          lps_ip_port ???

 // DWORD        session_id[4]

 

-#define MRIM_CS_PROXY_ACK	0x1045

+#define MRIM_CS_PROXY_ACK		0x1045

 //DWORD         status

-	#define PROXY_STATUS_OK					1

-	#define PROXY_STATUS_DECLINE			0

-	#define PROXY_STATUS_ERROR				2

+	#define PROXY_STATUS_OK			1

+	#define PROXY_STATUS_DECLINE		0

+	#define PROXY_STATUS_ERROR		2

 	#define PROXY_STATUS_INCOMPATIBLE_VERS	3

-	#define PROXY_STATUS_NOHARDWARE			4

-	#define PROXY_STATUS_MIRROR				5

-	#define PROXY_STATUS_CLOSED				6

+	#define PROXY_STATUS_NOHARDWARE		4

+	#define PROXY_STATUS_MIRROR		5

+	#define PROXY_STATUS_CLOSED		6

 // LPS           to e-mail ANSI

 // DWORD         id_request

 // DWORD         data_type

@@ -535,14 +533,14 @@ mrim_packet_header_t;
 // LPS:          lps_ip_port ???

 // DWORD[4]      Session_id

 

-#define MRIM_CS_PROXY_HELLO			0x1046

+#define MRIM_CS_PROXY_HELLO		0x1046

 // DWORD[4]      Session_id

 

 #define MRIM_CS_PROXY_HELLO_ACK		0x1047

 

 

 

-#define MRIM_CS_NEW_MAIL	0x1048 // S->C

+#define MRIM_CS_NEW_MAIL		0x1048 // S->C

 // UL unread count

 // LPS from e-mail ANSI

 // LPS subject ???

@@ -574,26 +572,26 @@ mrim_packet_header_t;
 // }

 

 

-#define MRIM_CS_UNKNOWN	0x1073

+#define MRIM_CS_UNKNOWN			0x1073

 // DWORD ???

 // DWORD ???

 

 

-#define MRIM_CS_USER_GEO	0x1077

+#define MRIM_CS_USER_GEO		0x1077

 // LPS user

 // LPS:	// DWORD flags?

-		// LPS: "geo-point":

-							// LPS dolgota

-							// LPS shirota

-							// LPS "MAPOBJECT"

-							// LPS some data?

-							// LPS/DWORD

-							// LPS/DWORD

-							// LPS some data?

-							// LPS some data?

-

-

-#define MRIM_CS_SERVER_SETTINGS	0x1079

+// LPS: "geo-point":

+	// LPS dolgota

+	// LPS shirota

+	// LPS "MAPOBJECT"

+	// LPS some data?

+	// LPS/DWORD

+	// LPS/DWORD

+	// LPS some data?

+	// LPS some data?

+

+

+#define MRIM_CS_SERVER_SETTINGS		0x1079