code cleaning

6 files changed, 15 insertions, 45 deletions

diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 009fc69479..3302d6e95d 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -141,7 +141,7 @@ int CMPlugin::Load()
 	// Init extra icons

 	hExtraActivity = ExtraIcon_RegisterIcolib("activity", LPGEN("Jabber Activity"), "jabber_dancing");

 	hExtraMood = ExtraIcon_RegisterIcolib("mood", LPGEN("Jabber Mood"), "jabber_contemplative");

-	g_MenuInit();

+	CJabberProto::GlobalMenuInit();

 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

 	JabberUserInfoInit();

 

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index ba45bc85d7..6aa603c045 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -488,7 +488,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 	return FALSE;

 }

 

-int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM hContact, LPARAM lParam)

+INT_PTR __cdecl CJabberProto::ContactMenuRunCommands(WPARAM hContact, LPARAM lParam)

 {

 	int res = -1;

 

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 77521b78ab..622ce74f29 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -70,36 +70,6 @@ static INT_PTR JabberMenuChooseService(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR JabberMenuBookmarkAdd(WPARAM hContact, LPARAM lParam)

-{

-	CJabberProto *ppro = CMPlugin::getInstance(hContact);

-	return(ppro) ? ppro->OnMenuBookmarkAdd(hContact, lParam) : 0;

-}

-

-static INT_PTR JabberMenuTransportLogin(WPARAM hContact, LPARAM lParam)

-{

-	CJabberProto *ppro = CMPlugin::getInstance(hContact);

-	return(ppro) ? ppro->OnMenuTransportLogin(hContact, lParam) : 0;

-}

-

-static INT_PTR JabberMenuTransportResolve(WPARAM hContact, LPARAM lParam)

-{

-	CJabberProto *ppro = CMPlugin::getInstance(hContact);

-	return(ppro) ? ppro->OnMenuTransportResolve(hContact, lParam) : 0;

-}

-

-static INT_PTR JabberContactMenuRunCommands(WPARAM hContact, LPARAM lParam)

-{

-	CJabberProto *ppro = CMPlugin::getInstance(hContact);

-	return(ppro) ? ppro->ContactMenuRunCommands(hContact, lParam) : 0;

-}

-

-static INT_PTR JabberMenuSendNote(WPARAM hContact, LPARAM lParam)

-{

-	CJabberProto *ppro = CMPlugin::getInstance(hContact);

-	return(ppro) ? ppro->OnMenuSendNote(hContact, lParam) : 0;

-}

-

 static INT_PTR JabberMenuHandleResource(WPARAM hContact, LPARAM lParam, LPARAM lRes)

 {

 	CJabberProto *ppro = CMPlugin::getInstance(hContact);

@@ -126,7 +96,7 @@ static int JabberPrebuildContactMenu(WPARAM hContact, LPARAM lParam)
 	return(ppro) ? ppro->OnPrebuildContactMenu(hContact, lParam) : 0;

 }

 

-void g_MenuInit(void)

+void CJabberProto::GlobalMenuInit()

 {

 	hStatusMenuInit = CreateHookableEvent(ME_JABBER_MENUINIT);

 

@@ -155,7 +125,7 @@ void g_MenuInit(void)
 	mi.position = -1999901006;

 	mi.hIcolibItem = g_plugin.getIconHandle(IDI_BOOKMARKS);

 	g_hMenuAddBookmark = Menu_AddContactMenuItem(&mi);

-	CreateServiceFunction(mi.pszService, JabberMenuBookmarkAdd);

+	CreateServiceFunction(mi.pszService, GlobalService<&CJabberProto::OnMenuBookmarkAdd>);

 

 	// Login/logout

 	SET_UID(mi, 0x7674d540, 0x2638, 0x4958, 0x99, 0xda, 0x8, 0x3f, 0xad, 0x66, 0x8f, 0xed);

@@ -164,7 +134,7 @@ void g_MenuInit(void)
 	mi.position = -1999901007;

 	mi.hIcolibItem = g_plugin.getIconHandle(IDI_LOGIN);

 	g_hMenuLogin = Menu_AddContactMenuItem(&mi);

-	CreateServiceFunction(mi.pszService, JabberMenuTransportLogin);

+	CreateServiceFunction(mi.pszService, GlobalService<&CJabberProto::OnMenuTransportLogin>);

 

 	// Retrieve nicks

 	SET_UID(mi, 0x6adf70d9, 0x6e92, 0x4a4f, 0x90, 0x71, 0x67, 0xa7, 0xaa, 0x1a, 0x19, 0x7a);

@@ -173,7 +143,7 @@ void g_MenuInit(void)
 	mi.position = -1999901008;

 	mi.hIcolibItem = g_plugin.getIconHandle(IDI_REFRESH);

 	g_hMenuRefresh = Menu_AddContactMenuItem(&mi);

-	CreateServiceFunction(mi.pszService, JabberMenuTransportResolve);

+	CreateServiceFunction(mi.pszService, GlobalService<&CJabberProto::OnMenuTransportResolve>);

 

 	// Run Commands

 	SET_UID(mi, 0x25546e26, 0xc82, 0x4715, 0xb8, 0xca, 0xe5, 0xf7, 0x2a, 0x58, 0x9, 0x2);

@@ -182,7 +152,7 @@ void g_MenuInit(void)
 	mi.position = -1999901009;

 	mi.hIcolibItem = g_plugin.getIconHandle(IDI_COMMAND);

 	g_hMenuCommands = Menu_AddContactMenuItem(&mi);

-	CreateServiceFunction(mi.pszService, JabberContactMenuRunCommands);

+	CreateServiceFunction(mi.pszService, GlobalService<&CJabberProto::ContactMenuRunCommands>);

 

 	// Send Note

 	SET_UID(mi, 0xf4b0cc51, 0xab9, 0x4cf0, 0x96, 0xaa, 0x22, 0xa0, 0x33, 0x9b, 0x56, 0xc5);

@@ -191,7 +161,7 @@ void g_MenuInit(void)
 	mi.position = -1999901010;

 	mi.hIcolibItem = g_plugin.getIconHandle(IDI_SEND_NOTE);

 	g_hMenuSendNote = Menu_AddContactMenuItem(&mi);

-	CreateServiceFunction(mi.pszService, JabberMenuSendNote);

+	CreateServiceFunction(mi.pszService, GlobalService<&CJabberProto::OnMenuSendNote>);

 

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

 	// Direct Presence

@@ -640,7 +610,7 @@ void CJabberProto::UpdatePriorityMenu(int priority)
 

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

 

-void CJabberProto::GlobalMenuInit()

+void CJabberProto::MenuInit()

 {

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

 	// Account chooser menu

@@ -730,7 +700,7 @@ int g_OnToolbarInit(WPARAM, LPARAM)
 	return 0;

 }

 

-void CJabberProto::GlobalMenuUninit()

+void CJabberProto::MenuUninit()

 {

 	if (m_phMenuResourceItems) {

 		for (int i = 0; i < m_nMenuResourceItems; i++)

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 9a60b558ae..2732b4ddd8 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -257,7 +257,7 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
 CJabberProto::~CJabberProto()

 {

 	ConsoleUninit();

-	GlobalMenuUninit();

+	MenuUninit();

 

 	if (m_hPopupClass)

 		Popup_UnregisterClass(m_hPopupClass);

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index fdd063bc0e..d49ac5357b 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -451,7 +451,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 

 	//---- jabber_adhoc.cpp --------------------------------------------------------------

 

-	int        __cdecl ContactMenuRunCommands(WPARAM wParam, LPARAM lParam);

+	INT_PTR     __cdecl ContactMenuRunCommands(WPARAM wParam, LPARAM lParam);

 			     

 	HWND       GetWindowFromIq(CJabberIqInfo *pInfo);

 	bool       HandleAdhocCommandRequest(const TiXmlElement *iqNode, CJabberIqInfo *pInfo);

@@ -792,8 +792,9 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	INT_PTR    __cdecl OnMenuTransportLogin(WPARAM wParam, LPARAM lParam);

 	INT_PTR    __cdecl OnMenuTransportResolve(WPARAM wParam, LPARAM lParam);

 

-	void       GlobalMenuInit(void);

-	void       GlobalMenuUninit(void);

+	static void GlobalMenuInit();

+	void       MenuInit(void);

+	void       MenuUninit(void);

 			     

 	void       MenuUpdateSrmmIcon(JABBER_LIST_ITEM *item);

 			     

diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h
index adbedafc6b..b15f3962f8 100644
--- a/protocols/JabberG/src/stdafx.h
+++ b/protocols/JabberG/src/stdafx.h
@@ -617,7 +617,6 @@ int lstrcmp_null(const wchar_t *s1, const wchar_t *s2);
 

 //---- jabber_menu.c ------------------------------------------------

 

-void   g_MenuInit();

 void   g_MenuUninit();

 int    g_OnToolbarInit(WPARAM, LPARAM);