fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)

5 files changed, 24 insertions, 35 deletions

diff --git a/include/delphi/statusmodes.inc b/include/delphi/statusmodes.inc
index e555c80a4b..795522d856 100644
--- a/include/delphi/statusmodes.inc
+++ b/include/delphi/statusmodes.inc
@@ -41,12 +41,12 @@ const
   ID_STATUS_DND        = 40074;

   ID_STATUS_NA         = 40075;

   ID_STATUS_OCCUPIED   = 40076;

-  ID_STATUS_FREECHAT   = 40077;

-  ID_STATUS_INVISIBLE  = 40078;

-  ID_STATUS_ONTHEPHONE = 40079;

-  ID_STATUS_OUTTOLUNCH = 40080;

+  ID_STATUS_INVISIBLE  = 40077;

   ID_STATUS_IDLE       = 40081; // do not use as a status

 

-  MAX_STATUS_COUNT = (ID_STATUS_OUTTOLUNCH-ID_STATUS_OFFLINE+1);

+  ID_STATUS_MIN        = ID_STATUS_OFFLINE;

+  ID_STATUS_MAX        = ID_STATUS_INVISIBLE;

+

+  MAX_STATUS_COUNT = (ID_STATUS_INVISIBLE-ID_STATUS_OFFLINE+1);

 

 {$ENDIF}

diff --git a/include/m_protocols.h b/include/m_protocols.h
index 0561695ad2..914026a403 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -88,10 +88,10 @@ struct ACKDATA
 {

 	const char *szModule;  // the name of the protocol module which initiated this ack

 	MCONTACT hContact;

-	int type;     // an ACKTYPE_ constant

-	int result; 	// an ACKRESULT_ constant

-	HANDLE hProcess;   // a caller-defined process code

-	LPARAM lParam;	   // caller-defined extra info

+	int type;              // an ACKTYPE_ constant

+	int result;            // an ACKRESULT_ constant

+	HANDLE hProcess;       // a caller-defined process code

+	LPARAM lParam;	        // caller-defined extra info

 };

 

 #define ME_PROTO_ACK "Proto/Ack"

@@ -268,7 +268,6 @@ struct MIR_APP_EXPORT PROTOACCOUNT : public MZeroedObject
 	int      iRealStatus;     // last status reported by protocol

 

 	int      protoindex;

-	int      protostatus[MAX_STATUS_COUNT];

 	HGENMENU menuhandle[MAX_STATUS_COUNT];

 

 	//---- methods ------------

diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 8ffed797c1..d511666fcb 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -94,9 +94,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define PF2_LONGAWAY      0x00000008 // NA on ICQ, Away on MSN

 #define PF2_LIGHTDND      0x00000010 // Occupied on ICQ, Busy on MSN

 #define PF2_HEAVYDND      0x00000020 // DND on ICQ

-#define PF2_FREECHAT      0x00000040

-#define PF2_OUTTOLUNCH    0x00000080

-#define PF2_ONTHEPHONE    0x00000100

 #define PF2_IDLE          0x00000200

 #define PF2_NONE          0x10000000 // protocol has no statuses at all

 

@@ -115,13 +112,10 @@ static __inline unsigned long Proto_Status2Flag(int status)
 	switch (status) {

 		case ID_STATUS_ONLINE:     return PF2_ONLINE;

 		case ID_STATUS_INVISIBLE:  return PF2_INVISIBLE;

-		case ID_STATUS_OUTTOLUNCH: return PF2_OUTTOLUNCH;

-		case ID_STATUS_ONTHEPHONE: return PF2_ONTHEPHONE;

 		case ID_STATUS_AWAY:       return PF2_SHORTAWAY;

 		case ID_STATUS_NA:         return PF2_LONGAWAY;

 		case ID_STATUS_OCCUPIED:   return PF2_LIGHTDND;

 		case ID_STATUS_DND:        return PF2_HEAVYDND;

-		case ID_STATUS_FREECHAT:   return PF2_FREECHAT;

 		case ID_STATUS_IDLE:       return PF2_IDLE;

 	}

 	return 0;

@@ -726,20 +720,20 @@ struct PROTOFILERESUME
 // DB event: EVENTTYPE_MESSAGE, blob contains szMessage without 0 terminator

 // Return 0 - success, other failure

 

-struct PROTORECVEVENT

-{

-	DWORD       flags;

-	DWORD       timestamp;  // unix time

-	char       *szMessage;  // message body in utf8

-	LPARAM      lParam;     // extra space for the network level protocol module

-	const char *szMsgId;    // server message id, optional, should be NULL otherwise

-	                        // ignored for protocols without PF4_SERVERMSGID in GetCaps()

-};

-

 #define PREF_CREATEREAD   1     // create the database event with the 'read' flag set

 #define PREF_RTL          4     // 0.5+ addition: support for right-to-left messages

 #define PREF_SENT        16     // message will be created with the DBEF_SENT flag

 

+struct PROTORECVEVENT

+{

+	DWORD flags;         // combination of PREF_*

+	DWORD timestamp;     // unix time

+	char* szMessage;     // message body in utf8

+	LPARAM lParam;       // extra space for the network level protocol module

+	const char* szMsgId; // server message id, optional, should be NULL otherwise

+	                     // ignored for protocols without PF4_SERVERMSGID in GetCaps()

+};

+

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

 // Proto/RecvMessage

 // Copies a message from a PROTORECVEVENT event into the database

diff --git a/include/m_skin.h b/include/m_skin.h
index 5d0e7f05bb..740c555d04 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -104,10 +104,7 @@ EXTERN_C MIR_APP_DLL(HANDLE) Skin_GetIconHandle(int idx);
 #define SKINICON_STATUS_NA          3

 #define SKINICON_STATUS_OCCUPIED    4

 #define SKINICON_STATUS_DND         5

-#define SKINICON_STATUS_FREE4CHAT   6

-#define SKINICON_STATUS_INVISIBLE   7

-#define SKINICON_STATUS_ONTHEPHONE  8

-#define SKINICON_STATUS_OUTTOLUNCH  9

+#define SKINICON_STATUS_INVISIBLE   6

 

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

 // Loads an icon representing the status mode for a particular protocol.

diff --git a/include/statusmodes.h b/include/statusmodes.h
index cafc3670ae..e712dd51f1 100644
--- a/include/statusmodes.h
+++ b/include/statusmodes.h
@@ -49,12 +49,11 @@ __forceinline bool IsStatusConnecting(int iStatus)
 #define ID_STATUS_DND             40074

 #define ID_STATUS_NA              40075

 #define ID_STATUS_OCCUPIED        40076

-#define ID_STATUS_FREECHAT        40077

-#define ID_STATUS_INVISIBLE       40078

-#define ID_STATUS_ONTHEPHONE      40079

-#define ID_STATUS_OUTTOLUNCH      40080

+#define ID_STATUS_INVISIBLE       40077

 #define ID_STATUS_IDLE            40081 /* do not use as a status */

 

-#define MAX_STATUS_COUNT          (ID_STATUS_OUTTOLUNCH-ID_STATUS_OFFLINE+1)

+#define ID_STATUS_MIN	          ID_STATUS_OFFLINE

+#define ID_STATUS_MAX             ID_STATUS_INVISIBLE

+#define MAX_STATUS_COUNT         (ID_STATUS_MAX-ID_STATUS_MIN+1)

 

 #endif // STATUSMODES_H__