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

2 files changed, 2 insertions, 11 deletions

diff --git a/plugins/SkypeStatusChange/src/main.cpp b/plugins/SkypeStatusChange/src/main.cpp
index 1abb83ad54..61a529e27b 100644
--- a/plugins/SkypeStatusChange/src/main.cpp
+++ b/plugins/SkypeStatusChange/src/main.cpp
@@ -52,18 +52,15 @@ enum
 

 LPCTSTR g_pszSkypeWndClassName = L"SkypeHelperWindow{155198f0-8749-47b7-ac53-58f2ac70844c}";

 

-const CMirandaStatus2SkypeStatus g_aStatusCode[10] =

+const CMirandaStatus2SkypeStatus g_aStatusCode[MAX_STATUS_COUNT] =

 {

 	{ID_STATUS_AWAY, "AWAY",L"Away"},

 	{ID_STATUS_NA, "AWAY",L"Not available"}, // removed in Skype 5

 	{ID_STATUS_DND, "DND",L"Do not disturb"},

 	{ID_STATUS_ONLINE, "ONLINE",L"Online"},

-	{ID_STATUS_FREECHAT, "ONLINE",L"Free for chat"},	// SKYPEME status doesn't work in Skype 4!

 	{ID_STATUS_OFFLINE, "OFFLINE",L"Offline"},

 	{ID_STATUS_INVISIBLE, "INVISIBLE",L"Invisible"},

 	{ID_STATUS_OCCUPIED,"DND",L"Occupied"},

-	{ID_STATUS_ONTHEPHONE,"DND",L"On the phone"},

-	{ID_STATUS_OUTTOLUNCH,"DND",L"Out to lunch"}

 };

 

 enum { INVALID_INDEX = 0xFFFFFFFF };

diff --git a/plugins/SkypeStatusChange/src/stdafx.h b/plugins/SkypeStatusChange/src/stdafx.h
index 1aaead0247..20a71727e0 100644
--- a/plugins/SkypeStatusChange/src/stdafx.h
+++ b/plugins/SkypeStatusChange/src/stdafx.h
@@ -33,9 +33,6 @@ class COptions
 		cssLongAway = 0x00000010,

 		cssLightDND = 0x00000020,

 		cssHeavyDND = 0x00000040,

-		cssFreeChart = 0x00000080,

-		cssOutToLunch = 0x00000100,

-		cssOnThePhone = 0x00000200,

 		cssIdle = 0x00000400,

 		cssAll = 0x80000000

 	};

@@ -46,13 +43,10 @@ class COptions
 		case ID_STATUS_ONLINE: return cssOnline;

 		case ID_STATUS_OFFLINE: return cssOffline;

 		case ID_STATUS_INVISIBLE: return cssInvisible;

-		case ID_STATUS_OUTTOLUNCH: return cssOutToLunch;

-		case ID_STATUS_ONTHEPHONE: return cssOnThePhone;

 		case ID_STATUS_AWAY: return cssShortAway;

 		case ID_STATUS_NA: return cssLongAway;

 		case ID_STATUS_OCCUPIED: return cssLightDND;

 		case ID_STATUS_DND: return cssHeavyDND;

-		case ID_STATUS_FREECHAT: return cssFreeChart;

 		case ID_STATUS_IDLE: return cssIdle;

 		}

 		return 0;

@@ -168,4 +162,4 @@ struct CMirandaStatus2SkypeStatus
 	LPCTSTR m_ptszStatusName;

 };

 

-extern const CMirandaStatus2SkypeStatus g_aStatusCode[10];

+extern const CMirandaStatus2SkypeStatus g_aStatusCode[MAX_STATUS_COUNT];