ported to miranda_ng

1 files changed, 8 insertions, 13 deletions

diff --git a/init.cpp b/init.cpp
index d04c437..b87e76f 100755
--- a/init.cpp
+++ b/init.cpp
@@ -24,14 +24,12 @@ list <JabberAccount*> Accounts;
 

 HINSTANCE hInst;

 HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL, g_hCLIcon = NULL, hExportGpgKeys = NULL, hImportGpgKeys = NULL;

-PLUGINLINK *pluginLink;

 IconExtraColumn g_IEC = {0};

 static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);

 extern char *date();

-MM_INTERFACE mmi = {0};

-UTF8_INTERFACE  utfi = {0};

 RECT key_from_keyserver_rect = {0}, firstrun_rect = {0}, new_key_rect = {0}, key_gen_rect = {0}, load_key_rect = {0}, import_key_rect = {0}, key_password_rect = {0}, load_existing_key_rect = {0};

 XML_API xi = {0};

+int hLangpack = 0;

 logtofile debuglog;

 bool gpg_valid = false, gpg_keyexist = false;

 std::map<HANDLE, contact_data> hcontact_data;

@@ -49,7 +47,6 @@ PLUGININFOEX pluginInfo={
 	"© 2010-2012 sss",

 	"http://sss.chaoslab.ru/tracker/mim_plugs/",

 	1,		//unicode

-	0,		//doesn't replace anything built-in

 	MIID_GPG

 };

 

@@ -116,13 +113,11 @@ void init_vars()
 	tabsrmm_used = isTabsrmmUsed();

 }

 

-extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)

+extern "C" int __declspec(dllexport) Load()

 {

-	pluginLink=link;

 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

-	mir_getMMI(&mmi);

-	mir_getUTFI(&utfi);

 	mir_getXI(&xi);	//TODO: check if we have access to api

+	mir_getLP(&pluginInfo);

 	init_vars();

 	CreateServiceFunction("/LoadPubKey",(MIRANDASERVICE)LoadKey);

 	CreateServiceFunction("/ToggleEncryption",(MIRANDASERVICE)ToggleEncryption);

@@ -136,7 +131,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Load GPG public key";

 	mi.pszService="/LoadPubKey";

-	hLoadPubKey = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);

+	hLoadPubKey = Menu_AddContactMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFe;

@@ -144,7 +139,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Toggle GPG encryption";

 	mi.pszService="/ToggleEncryption";

-	hToggleEncryption = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);

+	hToggleEncryption = Menu_AddContactMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFe;

@@ -152,7 +147,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Send public key";

 	mi.pszService="/SendKey";

-	hSendKey = (HANDLE)CallService(MS_CLIST_ADDCONTACTMENUITEM,0,(LPARAM)&mi);

+	hSendKey = Menu_AddContactMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

@@ -160,7 +155,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Export GPG Public keys from all users";

 	mi.pszService="/ExportGPGKeys";

-	hExportGpgKeys = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	hExportGpgKeys = Menu_AddMainMenuItem(&mi);

 	ZeroMemory(&mi,sizeof(mi));

 	mi.cbSize=sizeof(mi);

 	mi.position=-0x7FFFFFFF;

@@ -168,7 +163,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 	mi.pszName="Import GPG Public keys from all users";

 	mi.pszService="/ImportGPGKeys";

-	hImportGpgKeys = (HANDLE)CallService(MS_CLIST_ADDMAINMENUITEM,0,(LPARAM)&mi);

+	hImportGpgKeys = Menu_AddMainMenuItem(&mi);

 

 	return 0;

 }