services moved to the separate module

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

8 files changed, 519 insertions, 509 deletions

diff --git a/plugins/MyDetails/mydetails_10.vcxproj b/plugins/MyDetails/mydetails_10.vcxproj
index c2e40e587f..3c4b7f3910 100644
--- a/plugins/MyDetails/mydetails_10.vcxproj
+++ b/plugins/MyDetails/mydetails_10.vcxproj
@@ -198,6 +198,7 @@
     <ClCompile Include="..\utils\mir_smileys.cpp">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

+    <ClCompile Include="src\services.cpp" />

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

diff --git a/plugins/MyDetails/mydetails_10.vcxproj.filters b/plugins/MyDetails/mydetails_10.vcxproj.filters
index d14434912e..61d145d07b 100644
--- a/plugins/MyDetails/mydetails_10.vcxproj.filters
+++ b/plugins/MyDetails/mydetails_10.vcxproj.filters
@@ -39,6 +39,9 @@
     <ClCompile Include="src\stdafx.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\services.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

diff --git a/plugins/MyDetails/mydetails_12.vcxproj b/plugins/MyDetails/mydetails_12.vcxproj
index a63988f400..190909cdc7 100644
--- a/plugins/MyDetails/mydetails_12.vcxproj
+++ b/plugins/MyDetails/mydetails_12.vcxproj
@@ -201,6 +201,7 @@
     <ClCompile Include="..\utils\mir_smileys.cpp">

       <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

+    <ClCompile Include="src\services.cpp" />

     <ClCompile Include="src\stdafx.cpp">

       <PrecompiledHeader>Create</PrecompiledHeader>

     </ClCompile>

diff --git a/plugins/MyDetails/mydetails_12.vcxproj.filters b/plugins/MyDetails/mydetails_12.vcxproj.filters
index d14434912e..61d145d07b 100644
--- a/plugins/MyDetails/mydetails_12.vcxproj.filters
+++ b/plugins/MyDetails/mydetails_12.vcxproj.filters
@@ -39,6 +39,9 @@
     <ClCompile Include="src\stdafx.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="src\services.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\resource.rc">

diff --git a/plugins/MyDetails/src/commons.h b/plugins/MyDetails/src/commons.h
index 2a40d0e2e1..c779a189db 100644
--- a/plugins/MyDetails/src/commons.h
+++ b/plugins/MyDetails/src/commons.h
@@ -69,10 +69,19 @@ Boston, MA 02111-1307, USA.
 extern HINSTANCE hInst;

 extern long nickname_dialog_open;

 extern long status_msg_dialog_open;

-extern bool g_bFramesExist;

+extern bool g_bFramesExist, g_bAvsExist;

 

 #define PS_GETMYNICKNAMEMAXLENGTH "/GetMyNicknameMaxLength"

 

+INT_PTR PluginCommand_SetMyNicknameUI(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_SetMyNickname(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_GetMyNickname(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_SetMyAvatarUI(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_SetMyAvatar(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_GetMyAvatar(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_SetMyStatusMessageUI(WPARAM wParam, LPARAM lParam);

+INT_PTR PluginCommand_CycleThroughtProtocols(WPARAM wParam, LPARAM lParam);

+

 // Helper

 static __inline int DRAW_TEXT(HDC hDC, LPCTSTR lpString, int nCount, LPRECT lpRect, UINT uFormat, const char *protocol)

 {

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index bb2dd807ae..55b8a564d9 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -17,7 +17,6 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

-

 #include "commons.h"

 

 static char *StatusModeToDbSetting(int status, const char *suffix);

@@ -253,13 +252,7 @@ bool Protocol::HasAvatar()
 

 bool Protocol::CanGetAvatar()

 {

-	if (!can_have_avatar)

-		return false;

-

-	if (!ServiceExists(MS_AV_GETMYAVATAR))

-		return false;

-

-	return true;

+	return (can_have_avatar && g_bAvsExist);

 }

 

 void Protocol::GetAvatar()

@@ -345,16 +338,13 @@ void Protocol::SetNick(const TCHAR *nick)
 

 bool Protocol::CanSetAvatar()

 {

-	return ServiceExists(MS_AV_SETMYAVATAR) != FALSE && ServiceExists(MS_AV_CANSETMYAVATAR) != FALSE &&

-		CallService(MS_AV_CANSETMYAVATAR, (WPARAM)name, 0);

+	return g_bAvsExist && CallService(MS_AV_CANSETMYAVATAR, (WPARAM)name, 0);

 }

 

 void Protocol::SetAvatar(const TCHAR *file_name)

 {

-	if (!CanSetAvatar())

-		return;

-

-	CallService(MS_AV_SETMYAVATART, (WPARAM)name, (LPARAM)file_name);

+	if (CanSetAvatar())

+		CallService(MS_AV_SETMYAVATART, (WPARAM)name, (LPARAM)file_name);

 }

 

 bool Protocol::CanGetListeningTo()

@@ -479,7 +469,7 @@ int ProtocolArray::GetGlobalStatus()
 

 bool ProtocolArray::CanSetAvatars()

 {

-	return ServiceExists(MS_AV_SETMYAVATART) != FALSE;

+	return g_bAvsExist;

 }

 

 void ProtocolArray::SetAvatars(const TCHAR *file_name)

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index ac4c362c89..e67a2c5b8c 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -22,8 +22,9 @@ Boston, MA 02111-1307, USA.
 HINSTANCE hInst;

 int hLangpack = 0;

 

+bool g_bAvsExist;

 

-// Prototypes ///////////////////////////////////////////////////////////////////////////

+// Plugin data ////////////////////////////////////////////////////////////////////////////////////

 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

@@ -39,22 +40,13 @@ PLUGININFOEX pluginInfo={
 	{0xa82baeb3, 0xa33c, 0x4036, {0xb8, 0x37, 0x78, 0x3, 0xa5, 0xb6, 0xc2, 0xab}}

 };

 

-static IconItem iconList[] = {

+static IconItem iconList[] =

+{

 	{ LPGEN("Listening to"), "LISTENING_TO_ICON", IDI_LISTENINGTO },

 	{ LPGEN("Previous account"), "MYDETAILS_PREV_PROTOCOL", IDI_LEFT_ARROW },

 	{ LPGEN("Next account"), "MYDETAILS_NEXT_PROTOCOL", IDI_RIGHT_ARROW }

 };

 

-// Hooks

-HANDLE hModulesLoadedHook = NULL;

-HANDLE hPreShutdownHook = NULL;

-

-long nickname_dialog_open;

-HWND hwndSetNickname;

-

-long status_msg_dialog_open;

-HWND hwndSetStatusMsg;

-

 // Functions //////////////////////////////////////////////////////////////////////////////////////

 

 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

@@ -68,469 +60,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-// Set nickname ///////////////////////////////////////////////////////////////////////////////////

-

-#define WMU_SETDATA (WM_USER + 1)

-

-static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-		SendMessage(GetDlgItem(hwndDlg, IDC_NICKNAME), EM_LIMITTEXT, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE - 1, 0);

-		return TRUE;

-

-	case WMU_SETDATA:

-		{

-			int proto_num = (int)wParam;

-

-			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, proto_num);

-

-			if (proto_num == -1) {

-				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

-

-				// All protos have the same nick?

-				if (protocols->GetSize() > 0) {

-					TCHAR *nick = protocols->Get(0)->nickname;

-

-					bool foundDefNick = true;

-					for (int i = 1; foundDefNick && i < protocols->GetSize(); i++) {

-						if (_tcsicmp(protocols->Get(i)->nickname, nick) != 0) {

-							foundDefNick = false;

-							break;

-						}

-					}

-

-					if (foundDefNick)

-						if (_tcsicmp(protocols->default_nick, nick) != 0)

-							lstrcpy(protocols->default_nick, nick);

-				}

-

-				SetDlgItemText(hwndDlg, IDC_NICKNAME, protocols->default_nick);

-				SendDlgItemMessage(hwndDlg, IDC_NICKNAME, EM_LIMITTEXT, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE, 0);

-			}

-			else {

-				Protocol *proto = protocols->Get(proto_num);

-

-				TCHAR tmp[128];

-				mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my nickname for %s"), proto->description);

-

-				SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)tmp);

-

-				HICON hIcon = (HICON)CallProtoService(proto->name, PS_LOADICON, PLI_PROTOCOL, 0);

-				if (hIcon != NULL) {

-					SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);

-					DestroyIcon(hIcon);

-				}

-

-				SetDlgItemText(hwndDlg, IDC_NICKNAME, proto->nickname);

-				SendDlgItemMessage(hwndDlg, IDC_NICKNAME, EM_LIMITTEXT,

-					min(MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE, proto->GetNickMaxLength()), 0);

-			}

-

-			return TRUE;

-		}

-

-	case WM_COMMAND:

-		switch (wParam) {

-		case IDOK:

-			{

-				TCHAR tmp[MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE];

-				GetDlgItemText(hwndDlg, IDC_NICKNAME, tmp, SIZEOF(tmp));

-

-				LONG_PTR proto_num = GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-				if (proto_num == -1)

-					protocols->SetNicks(tmp);

-				else

-					protocols->Get(proto_num)->SetNick(tmp);

-

-				DestroyWindow(hwndDlg);

-				break;

-			}

-		case IDCANCEL:

-			DestroyWindow(hwndDlg);

-			break;

-		}

-		break;

-

-	case WM_CLOSE:

-		DestroyWindow(hwndDlg);

-		break;

-

-	case WM_DESTROY:

-		InterlockedExchange(&nickname_dialog_open, 0);

-		break;

-	}

-

-	return FALSE;

-}

-

-static INT_PTR PluginCommand_SetMyNicknameUI(WPARAM wParam, LPARAM lParam)

-{

-	char *proto = (char *)lParam;

-	int proto_num = -1;

-

-	if (proto != NULL) {

-		int i;

-		for (i = 0 ; i < protocols->GetSize() ; i++) {

-			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

-				proto_num = i;

-				break;

-			}

-		}

-

-		if (proto_num == -1)

-			return -1;

-

-		if (!protocols->Get(i)->CanSetNick())

-			return -2;

-

-	}

-

-	if (!nickname_dialog_open) {

-		InterlockedExchange(&nickname_dialog_open, 1);

-

-		hwndSetNickname = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SETNICKNAME), NULL, DlgProcSetNickname);

-		

-		SendMessage(hwndSetNickname, WMU_SETDATA, proto_num, 0);

-	}

-

-	SetForegroundWindow(hwndSetNickname);

-	SetFocus(hwndSetNickname);

- 	ShowWindow(hwndSetNickname, SW_SHOW);

-

-	return 0;

-}

-

-static INT_PTR PluginCommand_SetMyNickname(WPARAM wParam, LPARAM lParam)

-{

-	char *proto = (char *)wParam;

-	if (proto != NULL) {

-		for (int i = 0; i < protocols->GetSize(); i++) {

-			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

-				if (!protocols->Get(i)->CanSetNick())

-					return -2;

-

-				protocols->Get(i)->SetNick((TCHAR *)lParam);

-				return 0;

-			}

-		}

-

-		return -1;

-	}

-

-	protocols->SetNicks((TCHAR *)lParam);

-	return 0;

-}

-

-static INT_PTR PluginCommand_GetMyNickname(WPARAM wParam, LPARAM lParam)

-{

-	TCHAR *ret = (TCHAR *)lParam;

-	if (ret == NULL)

-		return -1;

-

-	char *proto = (char *)wParam;

-	if (proto == NULL) {

-		if (protocols->default_nick != NULL)

-			lstrcpyn(ret, protocols->default_nick, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE);

-		else

-			ret[0] = '\0';

-

-		return 0;

-	}

-	else {

-		Protocol *protocol = protocols->Get(proto);

-		if (protocol != NULL) {

-			lstrcpyn(ret, protocol->nickname, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE);

-			return 0;

-		}

-

-		return -1;

-	}

-}

-

-// Set avatar /////////////////////////////////////////////////////////////////////////////////////

-

-static INT_PTR PluginCommand_SetMyAvatarUI(WPARAM wParam, LPARAM lParam)

-{

-	char *proto = (char *)lParam;

-	int proto_num = -1;

-

-	if (proto != NULL) {

-		int i;

-		for (i = 0; i < protocols->GetSize(); i++) {

-			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

-				proto_num = i;

-				break;

-			}

-		}

-

-		if (proto_num == -1)

-			return -1;

-

-		if (!protocols->Get(i)->CanSetAvatar())

-			return -2;

-	}

-

-	if (proto_num == -1)

-		protocols->SetAvatars(NULL);

-	else

-		protocols->Get(proto_num)->SetAvatar(NULL);

-

-	return 0;

-}

-

-static INT_PTR PluginCommand_SetMyAvatar(WPARAM wParam, LPARAM lParam)

-{

-	char *proto = (char *)wParam;

-	if (proto != NULL) {

-		for (int i = 0; i < protocols->GetSize(); i++) {

-			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

-				if (!protocols->Get(i)->CanSetAvatar())

-					return -2;

-

-				protocols->Get(i)->SetAvatar((TCHAR *)lParam);

-				return 0;

-			}

-		}

-

-		return -1;

-	}

-

-	protocols->SetAvatars((TCHAR *)lParam);

-	return 0;

-}

-

-int Status2SkinIcon(int status)

-{

-	switch (status) {

-		case ID_STATUS_AWAY: return SKINICON_STATUS_AWAY;

-		case ID_STATUS_NA: return SKINICON_STATUS_NA;

-		case ID_STATUS_DND: return SKINICON_STATUS_DND;

-		case ID_STATUS_OCCUPIED: return SKINICON_STATUS_OCCUPIED;

-		case ID_STATUS_FREECHAT: return SKINICON_STATUS_FREE4CHAT;

-		case ID_STATUS_ONLINE: return SKINICON_STATUS_ONLINE;

-		case ID_STATUS_OFFLINE: return SKINICON_STATUS_OFFLINE;

-		case ID_STATUS_INVISIBLE: return SKINICON_STATUS_INVISIBLE;

-		case ID_STATUS_ONTHEPHONE: return SKINICON_STATUS_ONTHEPHONE;

-		case ID_STATUS_OUTTOLUNCH: return SKINICON_STATUS_OUTTOLUNCH;

-		case ID_STATUS_IDLE: return SKINICON_STATUS_AWAY;

-	}

-	return SKINICON_STATUS_OFFLINE;

-}

-

-static INT_PTR PluginCommand_GetMyAvatar(WPARAM wParam, LPARAM lParam)

-{

-	TCHAR *ret = (TCHAR *)lParam;

-	char *proto = (char *)wParam;

-

-	if (ret == NULL)

-		return -1;

-

-	if (proto == NULL) {

-		if (protocols->default_avatar_file != NULL)

-			lstrcpyn(ret, protocols->default_avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE);

-		else

-			ret[0] = '\0';

-

-		return 0;

-	}

-

-	for (int i = 0; i < protocols->GetSize(); i++) {

-		if (_stricmp(protocols->Get(i)->name, proto) == 0) {

-			if (!protocols->Get(i)->CanGetAvatar())

-				return -2;

-

-			protocols->Get(i)->GetAvatar();

-

-			if (protocols->Get(i)->avatar_file != NULL)

-				lstrcpyn(ret, protocols->Get(i)->avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE);

-			else 

-				ret[0] = '\0';

-

-			return 0;

-		}

-	}

-

-	return -1;

-}

-

-static LRESULT CALLBACK StatusMsgEditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch (msg) {

-	case WM_CHAR:

-		if (wParam == 0x0a && (GetKeyState(VK_CONTROL) & 0x8000) != 0) {

-			PostMessage(GetParent(hwnd), WM_COMMAND, IDOK, 0);

-			return 0;

-		}

-		break;

-	}

-

-	return mir_callNextSubclass(hwnd, StatusMsgEditSubclassProc, msg, wParam, lParam);

-}

-

-struct SetStatusMessageData {

-	int status;

-	int proto_num;

-};

-

-static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-		SendMessage(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), EM_LIMITTEXT, MS_MYDETAILS_GETMYSTATUSMESSAGE_BUFFER_SIZE - 1, 0);

-		mir_subclassWindow(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), StatusMsgEditSubclassProc);

-		return TRUE;

-

-	case WMU_SETDATA:

-		{

-			SetStatusMessageData *data = (SetStatusMessageData *)malloc(sizeof(SetStatusMessageData));

-			data->status = (int)wParam;

-			data->proto_num = (int)lParam;

-

-			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)data);

-

-			if (data->proto_num >= 0) {

-				Protocol *proto = protocols->Get(data->proto_num);

-

-				HICON hIcon = (HICON)CallProtoService(proto->name, PS_LOADICON, PLI_PROTOCOL, 0);

-				if (hIcon != NULL) {

-					SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);

-					DestroyIcon(hIcon);

-				}

-

-				TCHAR title[256];

-				mir_sntprintf(title, SIZEOF(title), TranslateT("Set my status message for %s"), proto->description);

-				SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)title);

-

-				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, proto->GetStatusMsg());

-			}

-			else if (data->status != 0) {

-				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(Status2SkinIcon(data->status)));

-

-				TCHAR title[256];

-				mir_sntprintf(title, SIZEOF(title), TranslateT("Set my status message for %s"),

-					CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, data->status, GSMDF_TCHAR));

-				SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)title);

-

-				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg(data->status));

-			}

-			else {

-				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

-

-				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg());

-			}

-

-			return TRUE;

-		}

-	case WM_COMMAND:

-		switch (wParam) {

-		case IDOK:

-			{

-				TCHAR tmp[MS_MYDETAILS_GETMYSTATUSMESSAGE_BUFFER_SIZE];

-				GetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, tmp, sizeof(tmp));

-

-				SetStatusMessageData *data = (SetStatusMessageData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-

-				if (data->proto_num >= 0)

-					protocols->Get(data->proto_num)->SetStatusMsg(tmp);

-				else if (data->status == 0)

-					protocols->SetStatusMsgs(tmp);

-				else

-					protocols->SetStatusMsgs(data->status, tmp);

-

-				DestroyWindow(hwndDlg);

-			}

-			break;

-

-		case IDCANCEL:

-			DestroyWindow(hwndDlg);

-			break;

-		}

-		break;

-

-	case WM_CLOSE:

-		DestroyWindow(hwndDlg);

-		break;

-

-	case WM_DESTROY:

-		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), GWLP_WNDPROC,

-			GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), GWLP_USERDATA));

-		free((SetStatusMessageData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

-		InterlockedExchange(&status_msg_dialog_open, 0);

-		break;

-	}

-

-	return FALSE;

-}

-

-static INT_PTR PluginCommand_SetMyStatusMessageUI(WPARAM wParam, LPARAM lParam)

-{

-	int status = (int)wParam;

-	char *proto_name = (char *)lParam;

-	int proto_num = -1;

-	Protocol *proto = NULL;

-

-	if (status != 0 && (status < ID_STATUS_OFFLINE || status > ID_STATUS_OUTTOLUNCH))

-		return -10;

-

-	if (proto_name != NULL) {

-		for (int i = 0; i < protocols->GetSize(); i++) {

-			proto = protocols->Get(i);

-

-			if (_stricmp(proto->name, proto_name) == 0) {

-				proto_num = i;

-				break;

-			}

-		}

-

-		if (proto_num == -1)

-			return -1;

-

-		if (protocols->CanSetStatusMsgPerProtocol() && !proto->CanSetStatusMsg())

-			return -2;

-	}

-	else if (ServiceExists(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG)) {

-		if (proto == NULL && status == 0)

-			CallService(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, protocols->GetGlobalStatus(), NULL);

-		else if (status == 0)

-			CallService(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, proto->status, (LPARAM)proto_name);

-		else

-			CallService(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, status, (LPARAM)proto_name);

-

-		return 0;

-	}

-	

-	if (proto == NULL || proto->status != ID_STATUS_OFFLINE) {

-		if (!status_msg_dialog_open) {

-			InterlockedExchange(&status_msg_dialog_open, 1);

-

-			hwndSetStatusMsg = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SETSTATUSMESSAGE), NULL, DlgProcSetStatusMessage);

-			

-			SendMessage(hwndSetStatusMsg, WMU_SETDATA, status, proto_num);

-		}

-

-		SetForegroundWindow(hwndSetStatusMsg);

-		SetFocus(hwndSetStatusMsg);

- 		ShowWindow(hwndSetStatusMsg, SW_SHOW);

-

-		return 0;

-	}

-

-	return -3;

-}

-

-

-static INT_PTR PluginCommand_CycleThroughtProtocols(WPARAM wParam, LPARAM lParam)

-{

-	db_set_b(NULL, "MyDetails", "CicleThroughtProtocols", (BYTE)wParam);

-

-	LoadOptions();

-

-	return 0;

-}

-

 // Services ///////////////////////////////////////////////////////////////////////////////////////

 

 static INT_PTR Menu_SetMyAvatarUI(WPARAM wParam, LPARAM lParam)

@@ -551,6 +80,9 @@ static INT_PTR Menu_SetMyStatusMessageUI(WPARAM wParam, LPARAM lParam)
 // Hook called after init

 static int MainInit(WPARAM wparam, LPARAM lparam)

 {

+	g_bAvsExist = ServiceExists(MS_AV_GETMYAVATAR) != 0;

+	g_bFramesExist = ServiceExists(MS_CLIST_FRAMES_ADDFRAME) != 0;

+

 	InitProtocolData();

 

 	// Add options to menu

@@ -593,7 +125,6 @@ static int MainInit(WPARAM wparam, LPARAM lparam)
 	Menu_AddMainMenuItem(&mi);

 

 	InitFrames();

-

 	return 0;

 }

 

@@ -613,10 +144,6 @@ extern "C" __declspec(dllexport) int Load()
 	HookEvent(ME_SYSTEM_MODULESLOADED, MainInit);

 	HookEvent(ME_SYSTEM_PRESHUTDOWN, MainUninit);

 

-	nickname_dialog_open = 0;

-	status_msg_dialog_open = 0;

-	g_bFramesExist = ServiceExists(MS_CLIST_FRAMES_ADDFRAME) != 0;

-

 	// Options

 	InitOptions();

 

@@ -637,7 +164,6 @@ extern "C" __declspec(dllexport) int Load()
 	CreateServiceFunction(MS_MYDETAILS_SHOWPREVIOUSPROTOCOL, PluginCommand_ShowPreviousProtocol);

 	CreateServiceFunction(MS_MYDETAILS_SHOWPROTOCOL, PluginCommand_ShowProtocol);

 	CreateServiceFunction(MS_MYDETAILS_CYCLE_THROUGH_PROTOCOLS, PluginCommand_CycleThroughtProtocols);

-

 	return 0;

 }

 

@@ -645,18 +171,6 @@ extern "C" __declspec(dllexport) int Load()
 

 extern "C" __declspec(dllexport) int Unload(void)

 {

-	DestroyServiceFunction(MS_MYDETAILS_SETMYNICKNAME);

-	DestroyServiceFunction(MS_MYDETAILS_SETMYNICKNAMEUI);

-	DestroyServiceFunction(MS_MYDETAILS_SETMYAVATAR);

-	DestroyServiceFunction(MS_MYDETAILS_SETMYAVATARUI);

-	DestroyServiceFunction(MS_MYDETAILS_GETMYNICKNAME);

-	DestroyServiceFunction(MS_MYDETAILS_GETMYAVATAR);

-	DestroyServiceFunction(MS_MYDETAILS_SETMYSTATUSMESSAGEUI);

-	DestroyServiceFunction(MS_MYDETAILS_SHOWNEXTPROTOCOL);

-	DestroyServiceFunction(MS_MYDETAILS_SHOWPREVIOUSPROTOCOL);

-	DestroyServiceFunction(MS_MYDETAILS_SHOWPROTOCOL);

-	DestroyServiceFunction(MS_MYDETAILS_CYCLE_THROUGH_PROTOCOLS);

-

 	DeInitProtocolData();

 	return 0;

 }

diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp
new file mode 100644
index 0000000000..a5d880436f
--- /dev/null
+++ b/plugins/MyDetails/src/services.cpp
@@ -0,0 +1,489 @@
+/*

+Copyright (C) 2005 Ricardo Pescuma Domenecci

+

+This is free software; you can redistribute it and/or

+modify it under the terms of the GNU Library General Public

+License as published by the Free Software Foundation; either

+version 2 of the License, or (at your option) any later version.

+

+This is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+Library General Public License for more details.

+

+You should have received a copy of the GNU Library General Public

+License along with this file; see the file license.txt.  If

+not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

+Boston, MA 02111-1307, USA.

+*/

+

+#include "commons.h"

+

+static long nickname_dialog_open;

+static HWND hwndSetNickname;

+

+static long status_msg_dialog_open;

+static HWND hwndSetStatusMsg;

+

+// Set nickname ///////////////////////////////////////////////////////////////////////////////////

+

+#define WMU_SETDATA (WM_USER + 1)

+

+static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+	switch (msg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

+		SendMessage(GetDlgItem(hwndDlg, IDC_NICKNAME), EM_LIMITTEXT, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE - 1, 0);

+		return TRUE;

+

+	case WMU_SETDATA:

+		{

+			int proto_num = (int)wParam;

+

+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, proto_num);

+

+			if (proto_num == -1) {

+				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

+

+				// All protos have the same nick?

+				if (protocols->GetSize() > 0) {

+					TCHAR *nick = protocols->Get(0)->nickname;

+

+					bool foundDefNick = true;

+					for (int i = 1; foundDefNick && i < protocols->GetSize(); i++) {

+						if (_tcsicmp(protocols->Get(i)->nickname, nick) != 0) {

+							foundDefNick = false;

+							break;

+						}

+					}

+

+					if (foundDefNick)

+						if (_tcsicmp(protocols->default_nick, nick) != 0)

+							lstrcpy(protocols->default_nick, nick);

+				}

+

+				SetDlgItemText(hwndDlg, IDC_NICKNAME, protocols->default_nick);

+				SendDlgItemMessage(hwndDlg, IDC_NICKNAME, EM_LIMITTEXT, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE, 0);

+			}

+			else {

+				Protocol *proto = protocols->Get(proto_num);

+

+				TCHAR tmp[128];

+				mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my nickname for %s"), proto->description);

+

+				SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)tmp);

+

+				HICON hIcon = (HICON)CallProtoService(proto->name, PS_LOADICON, PLI_PROTOCOL, 0);

+				if (hIcon != NULL) {

+					SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);

+					DestroyIcon(hIcon);

+				}

+

+				SetDlgItemText(hwndDlg, IDC_NICKNAME, proto->nickname);

+				SendDlgItemMessage(hwndDlg, IDC_NICKNAME, EM_LIMITTEXT,

+					min(MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE, proto->GetNickMaxLength()), 0);

+			}

+

+			return TRUE;

+		}

+

+	case WM_COMMAND:

+		switch (wParam) {

+		case IDOK:

+			{

+				TCHAR tmp[MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE];

+				GetDlgItemText(hwndDlg, IDC_NICKNAME, tmp, SIZEOF(tmp));

+

+				LONG_PTR proto_num = GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+				if (proto_num == -1)

+					protocols->SetNicks(tmp);

+				else

+					protocols->Get(proto_num)->SetNick(tmp);

+

+				DestroyWindow(hwndDlg);

+				break;

+			}

+		case IDCANCEL:

+			DestroyWindow(hwndDlg);

+			break;

+		}

+		break;

+

+	case WM_CLOSE:

+		DestroyWindow(hwndDlg);

+		break;

+

+	case WM_DESTROY:

+		InterlockedExchange(&nickname_dialog_open, 0);

+		break;

+	}

+

+	return FALSE;

+}

+

+INT_PTR PluginCommand_SetMyNicknameUI(WPARAM wParam, LPARAM lParam)

+{

+	char *proto = (char *)lParam;

+	int proto_num = -1;

+

+	if (proto != NULL) {

+		int i;

+		for (i = 0 ; i < protocols->GetSize() ; i++) {

+			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

+				proto_num = i;

+				break;

+			}

+		}

+

+		if (proto_num == -1)

+			return -1;

+

+		if (!protocols->Get(i)->CanSetNick())

+			return -2;

+

+	}

+

+	if (!nickname_dialog_open) {

+		InterlockedExchange(&nickname_dialog_open, 1);

+

+		hwndSetNickname = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SETNICKNAME), NULL, DlgProcSetNickname);

+

+		SendMessage(hwndSetNickname, WMU_SETDATA, proto_num, 0);

+	}

+

+	SetForegroundWindow(hwndSetNickname);

+	SetFocus(hwndSetNickname);

+ 	ShowWindow(hwndSetNickname, SW_SHOW);

+

+	return 0;

+}

+

+INT_PTR PluginCommand_SetMyNickname(WPARAM wParam, LPARAM lParam)

+{

+	char *proto = (char *)wParam;

+	if (proto != NULL) {

+		for (int i = 0; i < protocols->GetSize(); i++) {

+			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

+				if (!protocols->Get(i)->CanSetNick())

+					return -2;

+

+				protocols->Get(i)->SetNick((TCHAR *)lParam);

+				return 0;

+			}

+		}

+

+		return -1;

+	}

+

+	protocols->SetNicks((TCHAR *)lParam);

+	return 0;

+}

+

+INT_PTR PluginCommand_GetMyNickname(WPARAM wParam, LPARAM lParam)

+{

+	TCHAR *ret = (TCHAR *)lParam;

+	if (ret == NULL)

+		return -1;

+

+	char *proto = (char *)wParam;

+	if (proto == NULL) {

+		if (protocols->default_nick != NULL)

+			lstrcpyn(ret, protocols->default_nick, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE);

+		else

+			ret[0] = '\0';

+

+		return 0;

+	}

+	else {

+		Protocol *protocol = protocols->Get(proto);

+		if (protocol != NULL) {

+			lstrcpyn(ret, protocol->nickname, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE);

+			return 0;

+		}

+

+		return -1;

+	}

+}

+

+// Set avatar /////////////////////////////////////////////////////////////////////////////////////

+

+INT_PTR PluginCommand_SetMyAvatarUI(WPARAM wParam, LPARAM lParam)

+{

+	char *proto = (char *)lParam;

+	int proto_num = -1;

+

+	if (proto != NULL) {

+		int i;

+		for (i = 0; i < protocols->GetSize(); i++) {

+			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

+				proto_num = i;

+				break;

+			}

+		}

+

+		if (proto_num == -1)

+			return -1;

+

+		if (!protocols->Get(i)->CanSetAvatar())

+			return -2;

+	}

+

+	if (proto_num == -1)

+		protocols->SetAvatars(NULL);

+	else

+		protocols->Get(proto_num)->SetAvatar(NULL);

+

+	return 0;

+}

+

+INT_PTR PluginCommand_SetMyAvatar(WPARAM wParam, LPARAM lParam)

+{

+	char *proto = (char *)wParam;

+	if (proto != NULL) {

+		for (int i = 0; i < protocols->GetSize(); i++) {

+			if (_stricmp(protocols->Get(i)->name, proto) == 0) {

+				if (!protocols->Get(i)->CanSetAvatar())

+					return -2;

+

+				protocols->Get(i)->SetAvatar((TCHAR *)lParam);

+				return 0;

+			}

+		}

+

+		return -1;

+	}

+

+	protocols->SetAvatars((TCHAR *)lParam);

+	return 0;

+}

+

+int Status2SkinIcon(int status)

+{

+	switch (status) {

+		case ID_STATUS_AWAY: return SKINICON_STATUS_AWAY;

+		case ID_STATUS_NA: return SKINICON_STATUS_NA;

+		case ID_STATUS_DND: return SKINICON_STATUS_DND;

+		case ID_STATUS_OCCUPIED: return SKINICON_STATUS_OCCUPIED;

+		case ID_STATUS_FREECHAT: return SKINICON_STATUS_FREE4CHAT;

+		case ID_STATUS_ONLINE: return SKINICON_STATUS_ONLINE;

+		case ID_STATUS_OFFLINE: return SKINICON_STATUS_OFFLINE;

+		case ID_STATUS_INVISIBLE: return SKINICON_STATUS_INVISIBLE;

+		case ID_STATUS_ONTHEPHONE: return SKINICON_STATUS_ONTHEPHONE;

+		case ID_STATUS_OUTTOLUNCH: return SKINICON_STATUS_OUTTOLUNCH;

+		case ID_STATUS_IDLE: return SKINICON_STATUS_AWAY;

+	}

+	return SKINICON_STATUS_OFFLINE;

+}

+

+INT_PTR PluginCommand_GetMyAvatar(WPARAM wParam, LPARAM lParam)

+{

+	TCHAR *ret = (TCHAR *)lParam;

+	char *proto = (char *)wParam;

+

+	if (ret == NULL)

+		return -1;

+

+	if (proto == NULL) {

+		if (protocols->default_avatar_file != NULL)

+			lstrcpyn(ret, protocols->default_avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE);

+		else

+			ret[0] = '\0';

+

+		return 0;

+	}

+

+	for (int i = 0; i < protocols->GetSize(); i++) {

+		if (_stricmp(protocols->Get(i)->name, proto) == 0) {

+			if (!protocols->Get(i)->CanGetAvatar())

+				return -2;

+

+			protocols->Get(i)->GetAvatar();

+

+			if (protocols->Get(i)->avatar_file != NULL)

+				lstrcpyn(ret, protocols->Get(i)->avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE);

+			else

+				ret[0] = '\0';

+

+			return 0;

+		}

+	}

+

+	return -1;

+}

+

+static LRESULT CALLBACK StatusMsgEditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+	switch (msg) {

+	case WM_CHAR:

+		if (wParam == 0x0a && (GetKeyState(VK_CONTROL) & 0x8000) != 0) {

+			PostMessage(GetParent(hwnd), WM_COMMAND, IDOK, 0);

+			return 0;

+		}

+		break;

+	}

+

+	return mir_callNextSubclass(hwnd, StatusMsgEditSubclassProc, msg, wParam, lParam);

+}

+

+struct SetStatusMessageData {

+	int status;

+	int proto_num;

+};

+

+static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+{

+	switch (msg) {

+	case WM_INITDIALOG:

+		TranslateDialogDefault(hwndDlg);

+		SendMessage(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), EM_LIMITTEXT, MS_MYDETAILS_GETMYSTATUSMESSAGE_BUFFER_SIZE - 1, 0);

+		mir_subclassWindow(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), StatusMsgEditSubclassProc);

+		return TRUE;

+

+	case WMU_SETDATA:

+		{

+			SetStatusMessageData *data = (SetStatusMessageData *)malloc(sizeof(SetStatusMessageData));

+			data->status = (int)wParam;

+			data->proto_num = (int)lParam;

+

+			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)data);

+

+			if (data->proto_num >= 0) {

+				Protocol *proto = protocols->Get(data->proto_num);

+

+				HICON hIcon = (HICON)CallProtoService(proto->name, PS_LOADICON, PLI_PROTOCOL, 0);

+				if (hIcon != NULL) {

+					SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon);

+					DestroyIcon(hIcon);

+				}

+

+				TCHAR title[256];

+				mir_sntprintf(title, SIZEOF(title), TranslateT("Set my status message for %s"), proto->description);

+				SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)title);

+

+				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, proto->GetStatusMsg());

+			}

+			else if (data->status != 0) {

+				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(Status2SkinIcon(data->status)));

+

+				TCHAR title[256];

+				mir_sntprintf(title, SIZEOF(title), TranslateT("Set my status message for %s"),

+					CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, data->status, GSMDF_TCHAR));

+				SendMessage(hwndDlg, WM_SETTEXT, 0, (LPARAM)title);

+

+				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg(data->status));

+			}

+			else {

+				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

+

+				SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg());

+			}

+

+			return TRUE;

+		}

+	case WM_COMMAND:

+		switch (wParam) {

+		case IDOK:

+			{

+				TCHAR tmp[MS_MYDETAILS_GETMYSTATUSMESSAGE_BUFFER_SIZE];

+				GetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, tmp, sizeof(tmp));

+

+				SetStatusMessageData *data = (SetStatusMessageData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+

+				if (data->proto_num >= 0)

+					protocols->Get(data->proto_num)->SetStatusMsg(tmp);

+				else if (data->status == 0)

+					protocols->SetStatusMsgs(tmp);

+				else

+					protocols->SetStatusMsgs(data->status, tmp);

+

+				DestroyWindow(hwndDlg);

+			}

+			break;

+

+		case IDCANCEL:

+			DestroyWindow(hwndDlg);

+			break;

+		}

+		break;

+

+	case WM_CLOSE:

+		DestroyWindow(hwndDlg);

+		break;

+

+	case WM_DESTROY:

+		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), GWLP_WNDPROC,

+			GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_STATUSMESSAGE), GWLP_USERDATA));

+		free((SetStatusMessageData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA));

+		InterlockedExchange(&status_msg_dialog_open, 0);

+		break;

+	}

+

+	return FALSE;

+}

+

+INT_PTR PluginCommand_SetMyStatusMessageUI(WPARAM wParam, LPARAM lParam)

+{

+	int status = (int)wParam;

+	char *proto_name = (char *)lParam;

+	int proto_num = -1;

+	Protocol *proto = NULL;

+

+	if (status != 0 && (status < ID_STATUS_OFFLINE || status > ID_STATUS_OUTTOLUNCH))

+		return -10;

+

+	if (proto_name != NULL) {

+		for (int i = 0; i < protocols->GetSize(); i++) {

+			proto = protocols->Get(i);

+

+			if (_stricmp(proto->name, proto_name) == 0) {

+				proto_num = i;

+				break;

+			}

+		}

+

+		if (proto_num == -1)

+			return -1;

+

+		if (protocols->CanSetStatusMsgPerProtocol() && !proto->CanSetStatusMsg())

+			return -2;

+	}

+	else if (ServiceExists(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG)) {

+		if (proto == NULL && status == 0)

+			CallService(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, protocols->GetGlobalStatus(), NULL);

+		else if (status == 0)

+			CallService(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, proto->status, (LPARAM)proto_name);

+		else

+			CallService(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, status, (LPARAM)proto_name);

+

+		return 0;

+	}

+

+	if (proto == NULL || proto->status != ID_STATUS_OFFLINE) {

+		if (!status_msg_dialog_open) {

+			InterlockedExchange(&status_msg_dialog_open, 1);

+

+			hwndSetStatusMsg = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SETSTATUSMESSAGE), NULL, DlgProcSetStatusMessage);

+

+			SendMessage(hwndSetStatusMsg, WMU_SETDATA, status, proto_num);

+		}

+

+		SetForegroundWindow(hwndSetStatusMsg);

+		SetFocus(hwndSetStatusMsg);

+ 		ShowWindow(hwndSetStatusMsg, SW_SHOW);

+

+		return 0;

+	}

+

+	return -3;

+}

+

+

+INT_PTR PluginCommand_CycleThroughtProtocols(WPARAM wParam, LPARAM lParam)

+{

+	db_set_b(NULL, "MyDetails", "CicleThroughtProtocols", (BYTE)wParam);

+

+	LoadOptions();

+

+	return 0;

+}