New_GPG added to full solutions

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

9 files changed, 5 insertions, 329 deletions

diff --git a/plugins/New_GPG/README b/plugins/New_GPG/docs/README
index be5551c7ac..be5551c7ac 100755..100644
--- a/plugins/New_GPG/README
+++ b/plugins/New_GPG/docs/README
diff --git a/plugins/New_GPG/new_gpg_lang_ru.txt b/plugins/New_GPG/docs/new_gpg_lang_ru.txt
index 4cf3659695..4cf3659695 100755..100644
--- a/plugins/New_GPG/new_gpg_lang_ru.txt
+++ b/plugins/New_GPG/docs/new_gpg_lang_ru.txt
diff --git a/plugins/New_GPG/new_gpg_10.vcxproj b/plugins/New_GPG/new_gpg_10.vcxproj
index 7dfa1d30fb..135ccb6228 100755
--- a/plugins/New_GPG/new_gpg_10.vcxproj
+++ b/plugins/New_GPG/new_gpg_10.vcxproj
@@ -61,7 +61,7 @@
   <PropertyGroup Label="Globals">

     <ProjectGuid>{F29D0C8D-141A-43CF-86B2-34A04653F8D4}</ProjectGuid>

     <RootNamespace>new_gpg</RootNamespace>

-    <ProjectName>new_gpg</ProjectName>

+    <ProjectName>New_GPG</ProjectName>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'" Label="Configuration">

@@ -308,7 +308,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -358,7 +358,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -447,7 +447,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -492,7 +492,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>.\src\include;..\..\..\boost_1_49_0;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

diff --git a/plugins/New_GPG/dependencies/include/utf8.h b/plugins/New_GPG/src/include/utf8.h
index 4e4451403f..4e4451403f 100755..100644
--- a/plugins/New_GPG/dependencies/include/utf8.h
+++ b/plugins/New_GPG/src/include/utf8.h
diff --git a/plugins/New_GPG/dependencies/include/utf8/checked.h b/plugins/New_GPG/src/include/utf8/checked.h
index 3b00644444..3b00644444 100755..100644
--- a/plugins/New_GPG/dependencies/include/utf8/checked.h
+++ b/plugins/New_GPG/src/include/utf8/checked.h
diff --git a/plugins/New_GPG/dependencies/include/utf8/core.h b/plugins/New_GPG/src/include/utf8/core.h
index 693d388c07..693d388c07 100755..100644
--- a/plugins/New_GPG/dependencies/include/utf8/core.h
+++ b/plugins/New_GPG/src/include/utf8/core.h
diff --git a/plugins/New_GPG/dependencies/include/utf8/unchecked.h b/plugins/New_GPG/src/include/utf8/unchecked.h
index b4547fad94..b4547fad94 100755..100644
--- a/plugins/New_GPG/dependencies/include/utf8/unchecked.h
+++ b/plugins/New_GPG/src/include/utf8/unchecked.h
diff --git a/plugins/New_GPG/src/m_extraicons.h b/plugins/New_GPG/src/m_extraicons.h
deleted file mode 100755
index 589d040cef..0000000000
--- a/plugins/New_GPG/src/m_extraicons.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

- Copyright (C) 2009 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.

- */

-

-#ifndef __M_EXTRAICONS_H__

-#define __M_EXTRAICONS_H__

-

-#define MIID_EXTRAICONSSERVICE { 0x62d80749, 0xf169, 0x4592, { 0xb4, 0x4d, 0x3d, 0xd6, 0xde, 0x9d, 0x50, 0xc5 } }

-

-

-#define EXTRAICON_TYPE_CALLBACK 0 	// Similar to old clist callbacks, it fires 2 notifications

-#define EXTRAICON_TYPE_ICOLIB 1 	// This extra icon will use only icons registered with icolib. No callbacks

-									// needed. Just call MS_EXTRAICON_SET_ICON passing the name of the extraicon to set one.

-

-

-typedef struct {

-	int cbSize;

-	int type;						// One of EXTRAICON_TYPE_*

-	const char *name;				// Internal name. More than one plugin can register extra icons with the same name

-									// if both have the same type. In this case, both will be handled as one.

-									// This is usefull for ex for extra status, where icq and jabber can share the same slot.

-									// If the types are different the second one will be denied.

-	const char *description;		// [Translated by plugin] Description to be used in GUI

-	const char *descIcon;			// [Optional] Name of an icon registered with icolib to be used in GUI.

-

-	// If type == EXTRAICON_TYPE_CALLBACK this two must be set

-

-	// Callback to add icons to clist, calling MS_CLIST_EXTRA_ADD_ICON

-	// wParam=lParam=0

-	MIRANDAHOOK RebuildIcons;

-

-	// Callback to set the icon to clist, calling MS_CLIST_EXTRA_SET_ICON or MS_EXTRAICON_SET_ICON

-	// wParam = HANDLE hContact

-	// lParam = int slot

-	MIRANDAHOOK ApplyIcon;

-

-	// Other optional callbacks

-

-	// [Optional] Callback called when extra icon was clicked

-	// wParam = HANDLE hContact

-	// lParam = int slot

-	// param = onClickParam

-	MIRANDAHOOKPARAM OnClick;

-

-	LPARAM onClickParam;

-

-} EXTRAICON_INFO;

-

-

-// Register an extra icon

-// wParam = (EXTRAICON_INFO *) Extra icon info

-// lParam = 0

-// Return: (HANDLE) id of extra icon on success, 0 on error

-#define MS_EXTRAICON_REGISTER "ExtraIcon/Register"

-

-

-typedef struct {

-	int cbSize;

-	HANDLE hExtraIcon;				// Value returned by MS_EXTRAICON_REGISTER

-	HANDLE hContact;				// Contact to set the extra icon

-	union {							// The icon to be set. This depends on the type of the extra icon:

-		HANDLE hImage; 				// Value returned by MS_CLIST_EXTRA_ADD_ICON (if EXTRAICON_TYPE_CALLBACK)

-		const char *icoName;		// Name of the icon registered with icolib (if EXTRAICON_TYPE_ICOLIB)

-	};

-} EXTRAICON;

-

-// Set an extra icon icon

-// wParam = (EXTRAICON *) Extra icon

-// Return: 0 on success

-#define MS_EXTRAICON_SET_ICON "ExtraIcon/SetIcon"

-

-

-

-#ifndef _NO_WRAPPERS

-#ifdef __cplusplus

-

-static HANDLE ExtraIcon_Register(const char *name, const char *description, const char *descIcon,

-								 MIRANDAHOOK RebuildIcons,

-								 MIRANDAHOOK ApplyIcon,

-								 MIRANDAHOOKPARAM OnClick = NULL, LPARAM onClickParam = NULL)

-{

-	if (!ServiceExists(MS_EXTRAICON_REGISTER))

-		return NULL;

-

-	EXTRAICON_INFO ei = {0};

-	ei.cbSize = sizeof(ei);

-	ei.type = EXTRAICON_TYPE_CALLBACK;

-	ei.name = name;

-	ei.description = description;

-	ei.descIcon = descIcon;

-	ei.RebuildIcons = RebuildIcons;

-	ei.ApplyIcon = ApplyIcon;

-	ei.OnClick = OnClick;

-	ei.onClickParam = onClickParam;

-

-	return (HANDLE) CallService(MS_EXTRAICON_REGISTER, (WPARAM) &ei, 0);

-}

-

-static HANDLE ExtraIcon_Register(const char *name, const char *description, const char *descIcon = NULL,

-								 MIRANDAHOOKPARAM OnClick = NULL, LPARAM onClickParam = NULL)

-{

-	if (!ServiceExists(MS_EXTRAICON_REGISTER))

-		return NULL;

-

-	EXTRAICON_INFO ei = {0};

-	ei.cbSize = sizeof(ei);

-	ei.type = EXTRAICON_TYPE_ICOLIB;

-	ei.name = name;

-	ei.description = description;

-	ei.descIcon = descIcon;

-	ei.OnClick = OnClick;

-	ei.onClickParam = onClickParam;

-

-	return (HANDLE) CallService(MS_EXTRAICON_REGISTER, (WPARAM) &ei, 0);

-}

-

-static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, HANDLE hImage)

-{

-	EXTRAICON ei = {0};

-	ei.cbSize = sizeof(ei);

-	ei.hExtraIcon = hExtraIcon;

-	ei.hContact = hContact;

-	ei.hImage = hImage;

-

-	return CallService(MS_EXTRAICON_SET_ICON, (WPARAM) &ei, 0);

-}

-

-static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, const char *icoName)

-{

-	EXTRAICON ei = {0};

-	ei.cbSize = sizeof(ei);

-	ei.hExtraIcon = hExtraIcon;

-	ei.hContact = hContact;

-	ei.icoName = icoName;

-

-	return CallService(MS_EXTRAICON_SET_ICON, (WPARAM) &ei, 0);

-}

-

-#endif

-#endif

-

-

-#endif // __M_EXTRAICONS_H__

diff --git a/plugins/New_GPG/src/m_metacontacts.h b/plugins/New_GPG/src/m_metacontacts.h
deleted file mode 100755
index 9f348bd2c6..0000000000
--- a/plugins/New_GPG/src/m_metacontacts.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*

-

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright © 2004 Universite Louis PASTEUR, STRASBOURG.

-Copyright © 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)

-

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

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

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

-

-This program 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 General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef M_METACONTACTS_H__

-#define M_METACONTACTS_H__ 1

-

-#ifndef MIID_METACONTACTS

-#define MIID_METACONTACTS	{0xc0325019, 0xc1a7, 0x40f5, { 0x83, 0x65, 0x4f, 0x46, 0xbe, 0x21, 0x86, 0x3e}}

-#endif

-

-//get the handle for a contact's parent metacontact

-//wParam=(HANDLE)hSubContact

-//lParam=0

-//returns a handle to the parent metacontact, or null if this contact is not a subcontact

-#define MS_MC_GETMETACONTACT				"MetaContacts/GetMeta"

-

-//gets the handle for the default contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a handle to the default contact, or null on failure

-#define MS_MC_GETDEFAULTCONTACT				"MetaContacts/GetDefault"

-

-//gets the contact number for the default contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a DWORD contact number, or -1 on failure

-#define MS_MC_GETDEFAULTCONTACTNUM			"MetaContacts/GetDefaultNum"

-

-//gets the handle for the 'most online' contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a handle to the 'most online' contact

-#define MS_MC_GETMOSTONLINECONTACT			"MetaContacts/GetMostOnline"

-

-//gets the number of subcontacts for a metacontact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a DWORD representing the number of subcontacts for the given metacontact

-#define MS_MC_GETNUMCONTACTS				"MetaContacts/GetNumContacts"

-

-//gets the handle of a subcontact, using the subcontact's number

-//wParam=(HANDLE)hMetaContact

-//lParam=(DWORD)contact number

-//returns a handle to the specified subcontact

-#define MS_MC_GETSUBCONTACT					"MetaContacts/GetSubContact"

-

-//sets the default contact, using the subcontact's contact number

-//wParam=(HANDLE)hMetaContact

-//lParam=(DWORD)contact number

-//returns 0 on success

-#define MS_MC_SETDEFAULTCONTACTNUM			"MetaContacts/SetDefault"

-

-//sets the default contact, using the subcontact's handle

-//wParam=(HANDLE)hMetaContact

-//lParam=(HANDLE)hSubcontact

-//returns 0 on success

-#define MS_MC_SETDEFAULTCONTACT				"MetaContacts/SetDefaultByHandle"

-

-//forces the metacontact to send using a specific subcontact, using the subcontact's contact number

-//wParam=(HANDLE)hMetaContact

-//lParam=(DWORD)contact number

-//returns 0 on success

-#define MS_MC_FORCESENDCONTACTNUM			"MetaContacts/ForceSendContact"

-

-//forces the metacontact to send using a specific subcontact, using the subcontact's handle

-//wParam=(HANDLE)hMetaContact

-//lParam=(HANDLE)hSubcontact

-//returns 0 on success (will fail if 'force default' is in effect)

-#define MS_MC_FORCESENDCONTACT				"MetaContacts/ForceSendContactByHandle"

-

-//'unforces' the metacontact to send using a specific subcontact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns 0 on success (will fail if 'force default' is in effect)

-#define MS_MC_UNFORCESENDCONTACT			"MetaContacts/UnforceSendContact"

-

-//'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact

-// overrides (and clears) 'force send' above, and will even force use of offline contacts

-// will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns 1(true) or 0(false) representing new state of 'force default'

-#define MS_MC_FORCEDEFAULT					"MetaContacts/ForceSendDefault"

-

-// method to get state of 'force' for a metacontact

-// wParam=(HANDLE)hMetaContact

-// lParam= (DWORD)&contact_number or NULL

-// 

-// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,

-// or if none is in force, the value (DWORD)-1 will be copied

-// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)

-#define MS_MC_GETFORCESTATE					"MetaContacts/GetForceState"

-

-// fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)

-// wParam=(HANDLE)hMetaContact

-// lParam=(HANDLE)hDefaultContact

-#define ME_MC_DEFAULTTCHANGED				"MetaContacts/DefaultChanged"

-

-// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when 

-//	contacts are reordered) - a signal to re-read metacontact data

-// wParam=(HANDLE)hMetaContact

-// lParam=0

-#define ME_MC_SUBCONTACTSCHANGED			"MetaContacts/SubcontactsChanged"

-

-// fired when a metacontact is forced to send using a specific subcontact

-// wParam=(HANDLE)hMetaContact

-// lParam=(HANDLE)hForceContact 

-#define ME_MC_FORCESEND						"MetaContacts/ForceSend"

-

-// fired when a metacontact is 'unforced' to send using a specific subcontact

-// wParam=(HANDLE)hMetaContact

-// lParam=0 

-#define ME_MC_UNFORCESEND					"MetaContacts/UnforceSend"

-

-// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)

-// wParam=lParam=0

-#define MS_MC_GETPROTOCOLNAME				"MetaContacts/GetProtoName"

-

-

-// added 0.9.5.0 (22/3/05)

-// wParam=(HANDLE)hContact

-// lParam=0

-// convert a given contact into a metacontact

-#define MS_MC_CONVERTTOMETA					"MetaContacts/ConvertToMetacontact"

-

-// added 0.9.5.0 (22/3/05)

-// wParam=(HANDLE)hContact

-// lParam=(HANDLE)hMeta

-// add an existing contact to a metacontact

-#define MS_MC_ADDTOMETA						"MetaContacts/AddToMetacontact"

-

-// added 0.9.5.0 (22/3/05)

-// wParam=0

-// lParam=(HANDLE)hContact

-// remove a contact from a metacontact

-#define MS_MC_REMOVEFROMMETA				"MetaContacts/RemoveFromMetacontact"

-

-

-// added 0.9.13.2 (6/10/05)

-// wParam=(BOOL)disable

-// lParam=0

-// enable/disable the 'hidden group hack' - for clists that support subcontact hiding using 'IsSubcontact' setting

-// should be called once in the clist 'onmodulesloaded' event handler (which, since it's loaded after the db, will be called

-// before the metacontact onmodulesloaded handler where the subcontact hiding is usually done)

-#define MS_MC_DISABLEHIDDENGROUP			"MetaContacts/DisableHiddenGroup"

-

-#endif