From 31f0cb350f66ed8f075971774751261f6fd800e4 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Fri, 1 Mar 2013 05:37:28 +0000
Subject: removed not used headers
git-svn-id: http://svn.miranda-ng.org/main/trunk@3811 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
.../MetaContacts/MetaContacts_10.vcxproj.filters | 2 +-
.../MetaContacts/MetaContacts_11.vcxproj.filters | 2 +-
plugins/MetaContacts/res/MetaContacts.rc | 180 ++++++++-------------
plugins/MetaContacts/res/mcmenuoff2.ico | Bin 1150 -> 0 bytes
plugins/MetaContacts/res/version.rc | 14 +-
plugins/MetaContacts/src/icons.h | 6 -
plugins/MetaContacts/src/meta_main.cpp | 9 +-
plugins/MetaContacts/src/meta_services.cpp | 116 ++++++-------
plugins/MetaContacts/src/metacontacts.h | 23 +--
plugins/MetaContacts/src/version.h | 18 +--
10 files changed, 144 insertions(+), 226 deletions(-)
delete mode 100644 plugins/MetaContacts/res/mcmenuoff2.ico
delete mode 100644 plugins/MetaContacts/src/icons.h
diff --git a/plugins/MetaContacts/MetaContacts_10.vcxproj.filters b/plugins/MetaContacts/MetaContacts_10.vcxproj.filters
index 0a42f2de52..68ef7fcc59 100644
--- a/plugins/MetaContacts/MetaContacts_10.vcxproj.filters
+++ b/plugins/MetaContacts/MetaContacts_10.vcxproj.filters
@@ -54,7 +54,7 @@
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\resource.h">
- <Filter>Resource Files</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
diff --git a/plugins/MetaContacts/MetaContacts_11.vcxproj.filters b/plugins/MetaContacts/MetaContacts_11.vcxproj.filters
index 0a42f2de52..68ef7fcc59 100644
--- a/plugins/MetaContacts/MetaContacts_11.vcxproj.filters
+++ b/plugins/MetaContacts/MetaContacts_11.vcxproj.filters
@@ -54,7 +54,7 @@
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\resource.h">
- <Filter>Resource Files</Filter>
+ <Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
diff --git a/plugins/MetaContacts/res/MetaContacts.rc b/plugins/MetaContacts/res/MetaContacts.rc
index c9eb73a59b..b5ab5ebea2 100644
--- a/plugins/MetaContacts/res/MetaContacts.rc
+++ b/plugins/MetaContacts/res/MetaContacts.rc
@@ -44,123 +44,7 @@ BEGIN
TOPMARGIN, 4
BOTTOMMARGIN, 255
END
-END
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_METASELECT DIALOGEX 0, 0, 256, 259
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTROLPARENT
-CAPTION "Add to Existing MetaContact"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- CTEXT "Please select a MetaContact:",IDC_STATIC,27,11,201,14
- DEFPUSHBUTTON "&Ok",IDOK,73,238,48,14
- PUSHBUTTON "&Cancel",IDCANCEL,133,238,48,14
- LISTBOX IDC_METALIST,44,28,168,168,LBS_NOINTEGRALHEIGHT | WS_VSCROLL
- CONTROL "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,78,210,124,13
-END
-
-IDD_METAEDIT DIALOGEX 0, 0, 383, 260
-STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_STATICEDGE
-CAPTION "Editing"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "&OK",IDOK,106,241,50,14
- PUSHBUTTON "&Cancel",IDCANCEL,166,241,50,14
- LTEXT "Name:",IDC_STATIC,108,26,42,8
- GROUPBOX "Information",IDC_STATIC,5,4,373,45
- GROUPBOX "Contacts",IDC_FRAME,5,54,373,180
- PUSHBUTTON "&Apply",IDC_VALIDATE,226,241,50,14
- DEFPUSHBUTTON "&Remove",IDC_BTN_REM,53,181,50,14
- PUSHBUTTON "&Set as Default",IDC_BTN_SETDEFAULT,107,181,50,14
- PUSHBUTTON "Move &Up",IDC_BTN_UP,224,181,50,14
- PUSHBUTTON "Move &Down",IDC_BTN_DOWN,279,181,50,14
- EDITTEXT IDC_ED_NAME,158,23,135,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
- CONTROL "List1",IDC_LST_CONTACTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,53,79,276,89,WS_EX_CLIENTEDGE
- GROUPBOX "",IDC_STATIC,35,66,313,138
- CONTROL "Force use of default for sending (even if offline)",IDC_CHK_FORCEDEFAULT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,110,215,209,10
- PUSHBUTTON "Send &Offline",IDC_BTN_SETOFFLINE,161,181,50,14
-END
-
-#endif // Neutral (Default) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "..\\src\\resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxres.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-#endif // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral (Sys. Default) resources
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUSD)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-#endif // Neutral (Sys. Default) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (Australia) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
IDD_OPTIONS, DIALOG
BEGIN
VERTGUIDE, 4
@@ -210,6 +94,42 @@ END
// Dialog
//
+IDD_METASELECT DIALOGEX 0, 0, 256, 259
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+CAPTION "Add to Existing MetaContact"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ CTEXT "Please select a MetaContact:",IDC_STATIC,27,11,201,14
+ DEFPUSHBUTTON "&Ok",IDOK,73,238,48,14
+ PUSHBUTTON "&Cancel",IDCANCEL,133,238,48,14
+ LISTBOX IDC_METALIST,44,28,168,168,LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+ CONTROL "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,78,210,124,13
+END
+
+IDD_METAEDIT DIALOGEX 0, 0, 383, 260
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_STATICEDGE
+CAPTION "Editing"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "&OK",IDOK,106,241,50,14
+ PUSHBUTTON "&Cancel",IDCANCEL,166,241,50,14
+ LTEXT "Name:",IDC_STATIC,108,26,42,8
+ GROUPBOX "Information",IDC_STATIC,5,4,373,45
+ GROUPBOX "Contacts",IDC_FRAME,5,54,373,180
+ PUSHBUTTON "&Apply",IDC_VALIDATE,226,241,50,14
+ DEFPUSHBUTTON "&Remove",IDC_BTN_REM,53,181,50,14
+ PUSHBUTTON "&Set as Default",IDC_BTN_SETDEFAULT,107,181,50,14
+ PUSHBUTTON "Move &Up",IDC_BTN_UP,224,181,50,14
+ PUSHBUTTON "Move &Down",IDC_BTN_DOWN,279,181,50,14
+ EDITTEXT IDC_ED_NAME,158,23,135,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
+ CONTROL "List1",IDC_LST_CONTACTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,53,79,276,89,WS_EX_CLIENTEDGE
+ GROUPBOX "",IDC_STATIC,35,66,313,138
+ CONTROL "Force use of default for sending (even if offline)",IDC_CHK_FORCEDEFAULT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,110,215,209,10
+ PUSHBUTTON "Send &Offline",IDC_BTN_SETOFFLINE,161,181,50,14
+END
+
IDD_OPTIONS DIALOGEX 0, 0, 298, 178
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
@@ -286,6 +206,32 @@ BEGIN
END
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -300,7 +246,7 @@ IDI_MCREMOVE ICON "meta_remove2.ico"
IDI_MCCONVERT ICON "meta_convert.ico"
IDI_MCADD ICON "meta_add.ico"
IDI_MCSETDEFAULT ICON "meta_set_as_default.ico"
-#endif // English (Australia) resources
+#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/MetaContacts/res/mcmenuoff2.ico b/plugins/MetaContacts/res/mcmenuoff2.ico
deleted file mode 100644
index c9354f9296..0000000000
Binary files a/plugins/MetaContacts/res/mcmenuoff2.ico and /dev/null differ
diff --git a/plugins/MetaContacts/res/version.rc b/plugins/MetaContacts/res/version.rc
index 3ad9c3a4b3..5bfbab4754 100644
--- a/plugins/MetaContacts/res/version.rc
+++ b/plugins/MetaContacts/res/version.rc
@@ -1,32 +1,34 @@
+// Microsoft Visual C++ generated resource script.
+//
#ifdef APSTUDIO_INVOKED
#error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include <windows.h>
+#include "afxres.h"
#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x3fL
+ FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
+ FILEOS 0x4L
+ FILETYPE 0x0L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "000004b0"
BEGIN
- VALUE "Author", __AUTHOR
- VALUE "FileDescription", __DESC
+ VALUE "FileDescription", __DESCRIPTION
VALUE "InternalName", __PLUGIN_NAME
VALUE "LegalCopyright", __COPYRIGHT
VALUE "OriginalFilename", __FILENAME
+ VALUE "ProductName", __PLUGIN_NAME
END
END
BLOCK "VarFileInfo"
diff --git a/plugins/MetaContacts/src/icons.h b/plugins/MetaContacts/src/icons.h
deleted file mode 100644
index c77b1b02fc..0000000000
--- a/plugins/MetaContacts/src/icons.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ICONS_INC
-#define _ICONS_INC
-
-#include "metacontacts.h"
-
-#endif
diff --git a/plugins/MetaContacts/src/meta_main.cpp b/plugins/MetaContacts/src/meta_main.cpp
index 44c27c4e69..9c49a7ced9 100644
--- a/plugins/MetaContacts/src/meta_main.cpp
+++ b/plugins/MetaContacts/src/meta_main.cpp
@@ -84,9 +84,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "metacontacts.h"
-// Use VersionNo.h to set the version number, and ensure resource file is not open
-#include "version.h"
-
BOOL os_unicode_enabled = FALSE;
int hLangpack;
CLIST_INTERFACE *pcli = NULL;
@@ -94,16 +91,16 @@ CLIST_INTERFACE *pcli = NULL;
//! Information gathered by Miranda, displayed in the plugin pane of the Option Dialog
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
- __PLUGIN_NAME, // altered here and on file listing, so as not to match original
+ __PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
- __DESC,
+ __DESCRIPTION,
__AUTHOR,
__AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
// {4C4A27CF-5E64-4242-A332-B98B08243E89}
- {0x4c4a27cf, 0x5e64, 0x4242, {0xa3, 0x32, 0xb9, 0x8b, 0x8, 0x24, 0x3e, 0x89} }
+ {0x4c4a27cf, 0x5e64, 0x4242, {0xa3, 0x32, 0xb9, 0x8b, 0x8, 0x24, 0x3e, 0x89}}
};
HINSTANCE hInstance; //!< Global reference to the application
diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp
index 290d0acd52..a86b255730 100755
--- a/plugins/MetaContacts/src/meta_services.cpp
+++ b/plugins/MetaContacts/src/meta_services.cpp
@@ -1031,45 +1031,45 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
////////////////////////////////////////////////////////////////////////////
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_ALL | CMIF_ICONFROMICOLIB;
-
- // main menu item
- mi.icolibItem = GetIconHandle(I_MENUOFF);
- mi.pszName = LPGEN("Toggle MetaContacts Off");
- mi.pszService = "MetaContacts/OnOff";
- mi.position = 500010000;
- hMenuOnOff = Menu_AddMainMenuItem(&mi);
-
- // contact menu items
- mi.icolibItem = GetIconHandle(I_CONVERT);
- mi.position = -200010;
- mi.pszName = LPGEN("Convert to MetaContact");
- mi.pszService = "MetaContacts/Convert";
- hMenuConvert = Menu_AddContactMenuItem(&mi);
-
- mi.icolibItem = GetIconHandle(I_ADD);
- mi.position = -200009;
- mi.pszName = LPGEN("Add to existing MetaContact...");
- mi.pszService = "MetaContacts/AddTo";
- hMenuAdd = Menu_AddContactMenuItem(&mi);
-
- mi.icolibItem = GetIconHandle(I_EDIT);
- mi.position = -200010;
- mi.pszName = LPGEN("Edit MetaContact...");
- mi.pszService = "MetaContacts/Edit";
- hMenuEdit = Menu_AddContactMenuItem(&mi);
-
- mi.icolibItem = GetIconHandle(I_SETDEFAULT);
- mi.position = -200009;
- mi.pszName = LPGEN("Set as MetaContact default");
- mi.pszService = "MetaContacts/Default";
- hMenuDefault = Menu_AddContactMenuItem(&mi);
-
- mi.icolibItem = GetIconHandle(I_REMOVE);
- mi.position = -200008;
- mi.pszName = LPGEN("Delete MetaContact");
- mi.pszService = "MetaContacts/Delete";
- hMenuDelete = Menu_AddContactMenuItem(&mi);
-
+
+ // main menu item
+ mi.icolibItem = GetIconHandle(I_MENUOFF);
+ mi.pszName = LPGEN("Toggle MetaContacts Off");
+ mi.pszService = "MetaContacts/OnOff";
+ mi.position = 500010000;
+ hMenuOnOff = Menu_AddMainMenuItem(&mi);
+
+ // contact menu items
+ mi.icolibItem = GetIconHandle(I_CONVERT);
+ mi.position = -200010;
+ mi.pszName = LPGEN("Convert to MetaContact");
+ mi.pszService = "MetaContacts/Convert";
+ hMenuConvert = Menu_AddContactMenuItem(&mi);
+
+ mi.icolibItem = GetIconHandle(I_ADD);
+ mi.position = -200009;
+ mi.pszName = LPGEN("Add to existing MetaContact...");
+ mi.pszService = "MetaContacts/AddTo";
+ hMenuAdd = Menu_AddContactMenuItem(&mi);
+
+ mi.icolibItem = GetIconHandle(I_EDIT);
+ mi.position = -200010;
+ mi.pszName = LPGEN("Edit MetaContact...");
+ mi.pszService = "MetaContacts/Edit";
+ hMenuEdit = Menu_AddContactMenuItem(&mi);
+
+ mi.icolibItem = GetIconHandle(I_SETDEFAULT);
+ mi.position = -200009;
+ mi.pszName = LPGEN("Set as MetaContact default");
+ mi.pszService = "MetaContacts/Default";
+ hMenuDefault = Menu_AddContactMenuItem(&mi);
+
+ mi.icolibItem = GetIconHandle(I_REMOVE);
+ mi.position = -200008;
+ mi.pszName = LPGEN("Delete MetaContact");
+ mi.pszService = "MetaContacts/Delete";
+ hMenuDelete = Menu_AddContactMenuItem(&mi);
+
mi.flags |= CMIF_HIDDEN;
mi.pszContactOwner = META_PROTO;
@@ -1105,13 +1105,13 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
Meta_HideLinkedContacts();
if ( !Meta_IsEnabled()) {
- // modify main menu item
- mi.flags = CMIM_NAME | CMIM_ICON;
- mi.icolibItem = GetIconHandle(I_MENU);
- mi.pszName = LPGEN("Toggle MetaContacts On");
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&mi);
-
- Meta_HideMetaContacts(TRUE);
+ // modify main menu item
+ mi.flags = CMIM_NAME | CMIM_ICON;
+ mi.icolibItem = GetIconHandle(I_MENU);
+ mi.pszName = LPGEN("Toggle MetaContacts On");
+ CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&mi);
+
+ Meta_HideMetaContacts(TRUE);
}
else Meta_SuppressStatus(options.suppress_status);
@@ -1408,18 +1408,18 @@ INT_PTR Meta_OnOff(WPARAM wParam, LPARAM lParam)
mi.flags = CMIM_NAME | CMIM_ICON;
// just write to db - the rest is handled in the Meta_SettingChanged function
if (db_get_b(0, META_PROTO, "Enabled", 1)) {
- db_set_b(0, META_PROTO, "Enabled", 0);
- // modify main mi item
- mi.icolibItem = GetIconHandle(I_MENU);
- mi.pszName = LPGEN("Toggle MetaContacts On");
- } else {
- db_set_b(0, META_PROTO, "Enabled", 1);
- // modify main mi item
- mi.icolibItem = GetIconHandle(I_MENUOFF);
- mi.pszName = LPGEN("Toggle MetaContacts Off");
- }
- CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&mi);
- return 0;
+ db_set_b(0, META_PROTO, "Enabled", 0);
+ // modify main mi item
+ mi.icolibItem = GetIconHandle(I_MENU);
+ mi.pszName = LPGEN("Toggle MetaContacts On");
+ } else {
+ db_set_b(0, META_PROTO, "Enabled", 1);
+ // modify main mi item
+ mi.icolibItem = GetIconHandle(I_MENUOFF);
+ mi.pszName = LPGEN("Toggle MetaContacts Off");
+ }
+ CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuOnOff, (LPARAM)&mi);
+ return 0;
}
diff --git a/plugins/MetaContacts/src/metacontacts.h b/plugins/MetaContacts/src/metacontacts.h
index 4ca986a933..8dcca13ceb 100644
--- a/plugins/MetaContacts/src/metacontacts.h
+++ b/plugins/MetaContacts/src/metacontacts.h
@@ -28,42 +28,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define _WIN32_WINNT 0x0400
#define _WIN32_IE 0x0300
-#define MIRANDA_VER 0x0A00
-
-#include <m_stdhdr.h>
-
#include <windows.h>
-#include <commctrl.h>
-#include <string.h>
#include <time.h>
-#include "resource.h"
-
-#include "m_metacontacts.h"
#include <newpluginapi.h>
#include <m_clistint.h>
#include <m_clui.h>
#include <m_skin.h>
-#include <m_langpack.h>
#include <m_protomod.h>
#include <m_database.h>
#include <m_system.h>
-#include <m_protocols.h>
#include <m_userinfo.h>
-#include <m_options.h>
-#include <m_protosvc.h>
-#include <m_utils.h>
-#include <m_ignore.h>
-#include <m_clc.h>
#include <m_contacts.h>
#include <m_message.h>
#include <m_ignore.h>
#include <m_icolib.h>
#include <m_langpack.h>
-#include <m_popup.h>
-#include <m_cluiframes.h>
#include <win2k.h>
+#include <m_metacontacts.h>
+
+#include "resource.h"
+#include "version.h"
+
#define META_PROTO "MetaContacts"
#define META_FILTER "MetaContactsFilter"
#define META_ID "MetaID"
diff --git a/plugins/MetaContacts/src/version.h b/plugins/MetaContacts/src/version.h
index d05b7262a8..539b9f2d31 100644
--- a/plugins/MetaContacts/src/version.h
+++ b/plugins/MetaContacts/src/version.h
@@ -1,22 +1,14 @@
-// Set the version number here - it will affect the version resource and the version field of the pluginInfo structure
-// (Be careful that you don't have the resource file open when you change this and rebuild, otherwise the changes may not
-// take effect within the version resource)
-
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 14
#define __RELEASE_NUM 0
#define __BUILD_NUM 13
-#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-#define __STRINGIFY(x) #x
-#define __VERSION_STRING __STRINGIFY(__FILEVERSION_STRING_DOTS)
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __DESC "Merges contacts from the same or different protocols into one."
+#define __PLUGIN_NAME "MetaContacts"
+#define __FILENAME "MetaContacts.dll"
+#define __DESCRIPTION "Merges contacts from the same or different protocols into one."
#define __AUTHOR "J. Schaal & S. Ellis"
#define __AUTHOREMAIL "mail@scottellis.com.au"
-#define __COPYRIGHT "� 2005,2006 Scott Ellis"
#define __AUTHORWEB "http://miranda-ng.org/"
-#define __PLUGIN_NAME "MetaContacts"
-#define __FILENAME "MetaContacts.dll"
-
+#define __COPYRIGHT "� 2005,2006 Scott Ellis"
--
cgit v1.2.3