Updater removal - stage 3, TooltipNotify - changed place in options tree, AddContactPlys - small project fix

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

49 files changed, 4 insertions, 199 deletions

diff --git a/plugins/AVS/src/commonheaders.h b/plugins/AVS/src/commonheaders.h
index 5b9d4ee113..88e01d1f12 100644
--- a/plugins/AVS/src/commonheaders.h
+++ b/plugins/AVS/src/commonheaders.h
@@ -67,7 +67,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_avatarhistory.h"

 

 #include "resource.h"

-#include "m_updater.h"

 #include "m_flash.h"

 #include "image_utils.h"

 #include "mir_thread.h"

diff --git a/plugins/AddContactPlus/addcontactplus_10.vcxproj b/plugins/AddContactPlus/addcontactplus_10.vcxproj
index e443dc3069..442262e5c7 100644
--- a/plugins/AddContactPlus/addcontactplus_10.vcxproj
+++ b/plugins/AddContactPlus/addcontactplus_10.vcxproj
@@ -189,8 +189,8 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="res\addcontactplus.h" />

-    <ClInclude Include="res\Version.h" />

+    <ClInclude Include="src\addcontactplus.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="res\contact_add.ico" />

diff --git a/plugins/AddContactPlus/src/addcontactplus.h b/plugins/AddContactPlus/src/addcontactplus.h
index a42f0d14bb..280a349fce 100644
--- a/plugins/AddContactPlus/src/addcontactplus.h
+++ b/plugins/AddContactPlus/src/addcontactplus.h
@@ -44,7 +44,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <m_addcontact.h>

 

 #include "m_toptoolbar.h"

-#include "m_updater.h"

 #include "m_addcontactplus.h"

 

 #include "resource.h"

diff --git a/plugins/Alarms/src/common.h b/plugins/Alarms/src/common.h
index 36ac58ea3b..c7124edaa0 100644
--- a/plugins/Alarms/src/common.h
+++ b/plugins/Alarms/src/common.h
@@ -37,7 +37,6 @@
 

 #include <m_toptoolbar.h>

 #include <m_trigger.h>

-#include <m_updater.h>

 #include <m_alarms.h>

 

 #include "resource.h"

diff --git a/plugins/AuthState/src/commonheaders.h b/plugins/AuthState/src/commonheaders.h
index beead07b56..3e8e85c51c 100644
--- a/plugins/AuthState/src/commonheaders.h
+++ b/plugins/AuthState/src/commonheaders.h
@@ -48,7 +48,6 @@
 #include "Version.h"

 

 // Third party SDK headers

-#include "m_updater.h"

 #include "m_extraicons.h"

 

 static const int DefaultSlot = EXTRA_ICON_ADV2;

diff --git a/plugins/AvatarHistory/src/AvatarHistory.h b/plugins/AvatarHistory/src/AvatarHistory.h
index e6d7c185d5..5ac36d55f7 100644
--- a/plugins/AvatarHistory/src/AvatarHistory.h
+++ b/plugins/AvatarHistory/src/AvatarHistory.h
@@ -28,7 +28,6 @@
 

 #include <m_folders.h>

 #include <m_metacontacts.h>

-#include <m_updater.h>

 #include "m_avatarhist.h"

 #include "m_historyevents.h"

 

diff --git a/plugins/BasicHistory/src/stdafx.h b/plugins/BasicHistory/src/stdafx.h
index eede252cd2..d0d32d0d35 100644
--- a/plugins/BasicHistory/src/stdafx.h
+++ b/plugins/BasicHistory/src/stdafx.h
@@ -61,7 +61,6 @@
 #include <win2k.h>

 

 #include "m_toptoolbar.h"

-#include "m_updater.h"

 #include "m_smileyadd.h"

 #include "m_metacontacts.h"

 

diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index ed9e0495e9..e94bc5a239 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -18,7 +18,6 @@
 */

 

 #include "BossKey.h"

-#include "m_updater.h"

 #include "m_msg_buttonsbar.h"

 

 // multiple instances support:

diff --git a/plugins/BuddyExpectator/src/common.h b/plugins/BuddyExpectator/src/common.h
index 84be980bf1..18d33040eb 100644
--- a/plugins/BuddyExpectator/src/common.h
+++ b/plugins/BuddyExpectator/src/common.h
@@ -52,7 +52,6 @@
 #include <m_icolib.h>

 #include "m_popup.h"

 #include "m_popup2.h"

-#include "m_updater.h"

 #include "m_cluiframes.h"

 

 #define MODULE_NAME     "BuddyExpectator"

diff --git a/plugins/ChangeKeyboardLayout/src/commonheaders.h b/plugins/ChangeKeyboardLayout/src/commonheaders.h
index 32aa776844..b772f9555e 100644
--- a/plugins/ChangeKeyboardLayout/src/commonheaders.h
+++ b/plugins/ChangeKeyboardLayout/src/commonheaders.h
@@ -20,7 +20,6 @@
 #include <m_icolib.h>

 

 #include <m_ieview.h>

-#include <m_updater.h>

 #include "m_changekeyboardlayout.h"

 #include <m_popup2.h>

 

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 12ced514b8..f90aaed838 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -24,7 +24,6 @@
 #include "m_userinfo.h"

 #include "m_history.h"

 #include "m_protocols.h"

-#include "m_updater.h"

 #include "m_protosvc.h"

 #include "m_metacontacts.h"

 #include "m_icolib.h"

diff --git a/plugins/Clist_nicer/SRC/clui.cpp b/plugins/Clist_nicer/SRC/clui.cpp
index f7058a0f23..60560051bf 100644
--- a/plugins/Clist_nicer/SRC/clui.cpp
+++ b/plugins/Clist_nicer/SRC/clui.cpp
@@ -33,7 +33,6 @@
 #include <commonheaders.h>

 #include <m_findadd.h>

 #include <m_icq.h>

-#include <m_updater.h>

 #include "../cluiframes/cluiframes.h"

 #include "../coolsb/coolscroll.h"

 

@@ -254,7 +253,6 @@ static int CreateCLC(HWND parent)
 

 static int CluiModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	static Update upd = {0};

 	static const char *szPrefix = "clist_nicer_plus ";

 

 	static char *component = "CList Nicer+";

diff --git a/plugins/ContactsPlus/contacts.h b/plugins/ContactsPlus/contacts.h
index c433046d52..742f577924 100644
--- a/plugins/ContactsPlus/contacts.h
+++ b/plugins/ContactsPlus/contacts.h
@@ -60,8 +60,6 @@
 

 #include "resource.h"

 

-#include "m_updater.h"

-

 #include "utils.h"

 #include "send.h"

 #include "receive.h"

diff --git a/plugins/CryptoPP/commonheaders.h b/plugins/CryptoPP/commonheaders.h
index fee4216694..4f2ff10845 100644
--- a/plugins/CryptoPP/commonheaders.h
+++ b/plugins/CryptoPP/commonheaders.h
@@ -53,7 +53,6 @@
 #include <m_protosvc.h>

 #include <m_utils.h>

 #include <m_netlib.h>

-#include <m_updater.h>

 

 #endif

 

diff --git a/plugins/Dbx_tree/DatabaseLink.h b/plugins/Dbx_tree/DatabaseLink.h
index 0ec4cd78c4..c0c20b7fa0 100644
--- a/plugins/Dbx_tree/DatabaseLink.h
+++ b/plugins/Dbx_tree/DatabaseLink.h
@@ -25,5 +25,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Interface.h"

 #include "Database.h"

 #include "Services.h"

-#include "Compatibility.h"

-#include "m_updater.h"
\ No newline at end of file
+#include "Compatibility.h"
\ No newline at end of file
diff --git a/plugins/ExternalAPI/m_updater.h b/plugins/ExternalAPI/m_updater.h
deleted file mode 100644
index 9f6a92b5e2..0000000000
--- a/plugins/ExternalAPI/m_updater.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef _M_UPDATER_H

-#define _M_UPDATER_H

-

-// NOTES:

-// - For langpack updates, include a string of the following format in the langpack text file:

-//    ";FLID: <file listing name> <version>"

-//    version must be four numbers seperated by '.', in the range 0-255 inclusive

-// - Updater will disable plugins that are downloaded but were not active prior to the update (this is so that, if an archive contains e.g. ansi and 

-//    unicode versions, the correct plugin will be the only one active after the new version is installed)...so if you add a support plugin, you may need 

-//    to install an ini file to make the plugin activate when miranda restarts after the update

-// - Updater will replace all dlls that have the same internal shortName as a downloaded update dll (this is so that msn1.dll and msn2.dll, for example,

-//    will both be updated) - so if you have a unicode and a non-unicode version of a plugin in your archive, you should make the internal names different (which will break automatic 

-//    updates from the file listing if there is only one file listing entry for both versions, unless you use the 'MS_UPDATE_REGISTER' service below)

-// - Updater will install all files in the root of the archive into the plugins folder, except for langpack files that contain the FLID string which go into the root folder (same

-//    folder as miranda32.exe)...all folders in the archive will also be copied to miranda's root folder, and their contents transferred into the new folders. The only exception is a 

-//    special folder called 'root_files' - if there is a folder by that name in the archive, it's contents will also be copied into miranda's root folder - this is intended to be used 

-//    to install additional dlls etc that a plugin may require)

-

-// if you set Update.szUpdateURL to the following value when registering, as well as setting your beta site and version data,

-// Updater will ignore szVersionURL and pbVersionPrefix, and attempt to find the file listing URL's from the backend XML data.

-// for this to work, the plugin name in pluginInfo.shortName must match the file listing exactly (except for case)

-#define UPDATER_AUTOREGISTER		"UpdaterAUTOREGISTER"

-// Updater will also use the backend xml data if you provide URL's that reference the miranda file listing for updates (so you can use that method 

-// if e.g. your plugin shortName does not match the file listing) - it will grab the file listing id from the end of these URLs

-

-typedef struct Update_tag {

-  int cbSize;     

-  char *szComponentName;		// component name as it will appear in the UI (will be translated before displaying)

-

-  char *szVersionURL;			// URL where the current version can be found (NULL to disable)

-  BYTE *pbVersionPrefix;		// bytes occuring in VersionURL before the version, used to locate the version information within the URL data

-								// (note that this URL could point at a binary file - dunno why, but it could :)

-  int cpbVersionPrefix;			// number of bytes pointed to by pbVersionPrefix

-  char *szUpdateURL;			// URL where dll/zip is located

-								// set to UPDATER_AUTOREGISTER if you want Updater to find the file listing URLs (ensure plugin shortName matches file listing!)

-

-  char *szBetaVersionURL;		// URL where the beta version can be found (NULL to disable betas)

-  BYTE *pbBetaVersionPrefix;	// bytes occuring in VersionURL before the version, used to locate the version information within the URL data

-  int cpbBetaVersionPrefix;		// number of bytes pointed to by pbVersionPrefix

-  char *szBetaUpdateURL;		// URL where dll/zip is located

-

-  BYTE *pbVersion;				// bytes of current version, used for comparison with those in VersionURL

-  int cpbVersion;				// number of bytes pointed to by pbVersion

-

-  char *szBetaChangelogURL;		// url for displaying changelog for beta versions

-} Update;

-

-// register a comonent with Updater

-//

-// wparam = 0

-// lparam = (LPARAM)&Update

-#define MS_UPDATE_REGISTER      "Update/Register"

-

-// utility functions to create a version string from a DWORD or from pluginInfo

-// point buf at a buffer at least 16 chars wide - but note the version string returned may be shorter

-//

-__inline static char *CreateVersionString(DWORD version, char *buf) {

-	mir_snprintf(buf, 16, "%d.%d.%d.%d", (version >> 24) & 0xFF, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);

-	return buf;

-}

-

-__inline static char *CreateVersionStringPluginEx(PLUGININFOEX *pluginInfo, char *buf) {

-	return CreateVersionString(pluginInfo->version, buf);

-}

-

-

-// register the 'easy' way - use this method if you have no beta URL and the plugin is on the miranda file listing

-// NOTE: the plugin version string on the file listing must be the string version of the version in pluginInfo (i.e. 0.0.0.1,

-// four numbers between 0 and 255 inclusivem, so no letters, brackets, etc.)

-//

-// wParam = (int)fileID				- this is the file ID from the file listing (i.e. the number at the end of the download link)

-// lParam = (PLUGININFO*)&pluginInfo

-#define MS_UPDATE_REGISTERFL	"Update/RegisterFL"

-

-// this function can be used to 'unregister' components - useful for plugins that register non-plugin/langpack components and

-// may need to change those components on the fly

-// lParam = (char *)szComponentName

-#define MS_UPDATE_UNREGISTER	"Update/Unregister"

-

-// this event is fired when the startup process is complete, but NOT if a restart is imminent

-// it is designed for status managment plugins to use as a trigger for beggining their own startup process

-// wParam = lParam = 0 (unused)

-// (added in version 0.1.6.0)

-#define ME_UPDATE_STARTUPDONE	"Update/StartupDone"

-

-// this service can be used to enable/disable Updater's global status control

-// it can be called from the StartupDone event handler

-// wParam = (BOOL)enable

-// lParam = 0

-// (added in version 0.1.6.0)

-#define MS_UPDATE_ENABLESTATUSCONTROL	"Update/EnableStatusControl"

-

-// An description of usage of the above service and event:

-// Say you are a status control plugin that normally sets protocol or global statuses in your ModulesLoaded event handler.

-// In order to make yourself 'Updater compatible', you would move the status control code from ModulesLoaded to another function, 

-// say DoStartup. Then, in ModulesLoaded you would check for the existence of the MS_UPDATE_ENABLESTATUSCONTROL service.

-// If it does not exist, call DoStartup. If it does exist, hook the ME_UPDATE_STARTUPDONE event and call DoStartup from there. You may

-// also wish to call MS_UPDATE_ENABLESTATUSCONTROL with wParam == FALSE at this time, to disable Updater's own status control feature.

-

-// this service can be used to determine whether updates are possible for a component with the given name

-// wParam = 0

-// lParam = (char *)szComponentName

-// returns TRUE if updates are supported, FALSE otherwise

-#define MS_UPDATE_ISUPDATESUPPORTED		"Update/IsUpdateSupported"

-

-#endif

-

-

-/////////////// Usage Example ///////////////

-

-#ifdef EXAMPLE_CODE

-

-// you need to #include "m_updater.h" and HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded) in your Load function...

-

-int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {

-

-	Update update = {0}; // for c you'd use memset or ZeroMemory...

-	char szVersion[16];

-

-	update.cbSize = sizeof(Update);

-

-	update.szComponentName = pluginInfo.shortName;

-	update.pbVersion = (BYTE *)CreateVersionString(&pluginInfo, szVersion);

-	update.cpbVersion = strlen((char *)update.pbVersion);

-

-	// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 

-	// before the version that we use to locate it on the page

-	// (note that if the update URL and the version URL point to standard file listing entries, the backend xml

-	// data will be used to check for updates rather than the actual web page - this is not true for beta urls)

-	update.szUpdateURL = "http://scottellis.com.au:81/test/updater.zip";

-	update.szVersionURL = "http://scottellis.com.au:81/test/updater_test.html";

-	update.pbVersionPrefix = (BYTE *)"Updater version ";

-	

-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

-

-	// do the same for the beta versions of the above struct members if you wish to allow beta updates from another URL

-

-	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

-

-	// Alternatively, to register a plugin with e.g. file ID 2254 on the file listing...

-	// CallService(MS_UPDATE_REGISTERFL, (WPARAM)2254, (LPARAM)&pluginInfo);

-

-	return 0;

-}

-

-#endif

diff --git a/plugins/ExtraIcons/commons.h b/plugins/ExtraIcons/commons.h
index ff854f53dc..ede4e4325e 100644
--- a/plugins/ExtraIcons/commons.h
+++ b/plugins/ExtraIcons/commons.h
@@ -54,7 +54,6 @@ using namespace std;
 #include <m_database.h>

 #include <m_options.h>

 #include <m_utils.h>

-#include <m_updater.h>

 #include <m_metacontacts.h>

 #include <m_icolib.h>

 #include <m_skin.h>

diff --git a/plugins/FTPFileYM/common.h b/plugins/FTPFileYM/common.h
index c48982a66e..5e1ff74618 100644
--- a/plugins/FTPFileYM/common.h
+++ b/plugins/FTPFileYM/common.h
@@ -100,7 +100,6 @@ using namespace std;
 

 #include "resource.h"

 #include "m_ftpfile.h"

-#include "m_updater.h"

 #include "m_msg_buttonsbar.h"

 

 #if defined _WIN64

diff --git a/plugins/FingerPrintModPlus/src/fingerprint.cpp b/plugins/FingerPrintModPlus/src/fingerprint.cpp
index 64ce6f6450..e20150b5d9 100644
--- a/plugins/FingerPrintModPlus/src/fingerprint.cpp
+++ b/plugins/FingerPrintModPlus/src/fingerprint.cpp
@@ -233,7 +233,6 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 {

 	int i;

 

-	Update update = { 0 };

 	char szVersion[16];

 

 	g_LPCodePage = CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);

diff --git a/plugins/FingerPrintModPlus/src/global.h b/plugins/FingerPrintModPlus/src/global.h
index 16a491349d..cef88bbd81 100644
--- a/plugins/FingerPrintModPlus/src/global.h
+++ b/plugins/FingerPrintModPlus/src/global.h
@@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // plugins SDK

 #include <m_extraicons.h>

 #include <m_folders.h>

-#include <m_updater.h>

 

 //plugins header

 #include "version.h"

diff --git a/plugins/Folders/commonheaders.h b/plugins/Folders/commonheaders.h
index 7ce41f3fe6..f5bd57522b 100644
--- a/plugins/Folders/commonheaders.h
+++ b/plugins/Folders/commonheaders.h
@@ -48,7 +48,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_contacts.h"

 #include "m_popup.h"

 #include "m_fontservice.h"

-#include "m_updater.h"

 #include "m_variables.h"

 

 #ifndef MS_DB_GETPROFILEPATH_BASIC //db3xSA

diff --git a/plugins/Gender/commonheaders.h b/plugins/Gender/commonheaders.h
index e2add20d25..bdea1613da 100644
--- a/plugins/Gender/commonheaders.h
+++ b/plugins/Gender/commonheaders.h
@@ -56,7 +56,6 @@
 #include "resource.h"

 

 //external SDK headers

-#include "m_updater.h"

 #include "m_metacontacts.h"

 #include "m_extraicons.h"

 

diff --git a/plugins/IgnoreState/commonheaders.h b/plugins/IgnoreState/commonheaders.h
index dbc2a346cd..e21e302b69 100644
--- a/plugins/IgnoreState/commonheaders.h
+++ b/plugins/IgnoreState/commonheaders.h
@@ -59,7 +59,6 @@
 

 //external SDK headers

 #include <m_cluiframes.h>

-#include <m_updater.h>

 #include <m_extraicons.h>

 

 static const int DefaultSlot = EXTRA_ICON_PROTO;

diff --git a/plugins/KeyboardNotify/main.cpp b/plugins/KeyboardNotify/main.cpp
index 53722ea97b..e82cc2cfdc 100644
--- a/plugins/KeyboardNotify/main.cpp
+++ b/plugins/KeyboardNotify/main.cpp
@@ -207,7 +207,6 @@
 #include <m_utils.h>

 #include <m_icq.h>

 #include <m_metacontacts.h>

-#include <m_updater.h>

 #pragma comment(lib, "advapi32.lib")

 

 #define NCONVERS_BLINKID ((HANDLE)123456) //nconvers' random identifier used to flash an icon for "incoming message" on contact list

diff --git a/plugins/MenuItemEx/menuex.h b/plugins/MenuItemEx/menuex.h
index 958dc22881..3ad6f25686 100644
--- a/plugins/MenuItemEx/menuex.h
+++ b/plugins/MenuItemEx/menuex.h
@@ -27,7 +27,6 @@
 #include "m_genmenu.h"

 #include "m_popup.h"

 #include "m_message.h"

-#include "m_updater.h"

 #include "m_fingerprint.h"

 #include "m_metacontacts.h"

 #include "m_msg_buttonsbar.h"

diff --git a/plugins/MetaContacts/metacontacts.h b/plugins/MetaContacts/metacontacts.h
index 873b0e2e12..762bd17b8d 100644
--- a/plugins/MetaContacts/metacontacts.h
+++ b/plugins/MetaContacts/metacontacts.h
@@ -62,7 +62,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_popup.h>

 #include <m_cluiframes.h>

-#include "m_updater.h"

 

 #define META_PROTO				"MetaContacts"

 #define META_FILTER				"MetaContactsFilter"

diff --git a/plugins/MirOTR/MirOTR/stdafx.h b/plugins/MirOTR/MirOTR/stdafx.h
index 1315faa961..ec471e83bd 100644
--- a/plugins/MirOTR/MirOTR/stdafx.h
+++ b/plugins/MirOTR/MirOTR/stdafx.h
@@ -47,7 +47,6 @@
 

 //ExternalAPI

 #include <m_folders.h>

-#include <m_updater.h>

 #include <m_msg_buttonsbar.h>

 #include <m_metacontacts.h>

 

diff --git a/plugins/NewAwaySysMod/AwaySys.cpp b/plugins/NewAwaySysMod/AwaySys.cpp
index c1f8816590..2c087a3d9f 100644
--- a/plugins/NewAwaySysMod/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/AwaySys.cpp
@@ -33,7 +33,6 @@
 #include "m_genmenu.h"

 #include "m_idle.h"

 #include "m_statusplugins.h"

-#include "m_updater.h"

 #include "m_NewAwaySys.h"

 #include "m_ContactSettings.h"

 #include "MsgTree.h"

diff --git a/plugins/NewXstatusNotify/common.h b/plugins/NewXstatusNotify/common.h
index e085537294..3c805ad8c3 100644
--- a/plugins/NewXstatusNotify/common.h
+++ b/plugins/NewXstatusNotify/common.h
@@ -71,7 +71,6 @@
 #include "m_icq.h"

 

 #include "m_metacontacts.h"

-#include "m_updater.h"

 #include "m_toptoolbar.h"

 #include "resource.h"

 

diff --git a/plugins/Nudge/headers.h b/plugins/Nudge/headers.h
index 062bc8ee77..456af2d7ed 100644
--- a/plugins/Nudge/headers.h
+++ b/plugins/Nudge/headers.h
@@ -46,7 +46,6 @@
 #include <m_protosvc.h>

 #include <m_trigger.h>

 #include <m_metacontacts.h>

-#include <m_updater.h>	

 #include <m_icolib.h>	

 #include <win2k.h>

 #include "resource.h"

diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index 032b050899..09f505504b 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -131,7 +131,6 @@ Last change by : $Author: Merlin_de $
 	#endif // MTEXT_NOHELPERS

 	#include <m_text.h>

 	#include <m_toptoolbar.h>

-	#include <m_updater.h>

 	#include <m_popup.h>			//core define see miranda\include\

 

 	// API for 3rd party plugins (.\api folder)

diff --git a/plugins/QuickMessages/quickmessages.h b/plugins/QuickMessages/quickmessages.h
index 5de5f0eb52..1e9a3d9761 100644
--- a/plugins/QuickMessages/quickmessages.h
+++ b/plugins/QuickMessages/quickmessages.h
@@ -42,7 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #include "Utils.h"

 #include "m_msg_buttonsbar.h"

-#include "m_updater.h"

 

 #pragma optimize("gsy",on)

 

diff --git a/plugins/Rate/commonheaders.h b/plugins/Rate/commonheaders.h
index 56abcd36f4..9fde7034e0 100644
--- a/plugins/Rate/commonheaders.h
+++ b/plugins/Rate/commonheaders.h
@@ -51,7 +51,6 @@
 

 //external SDK headers

 #include <m_cluiframes.h>

-#include <m_updater.h>

 #include <m_extraicons.h>

 

 static const int DefaultSlot = EXTRA_ICON_PROTO;

diff --git a/plugins/RecentContacts/RecentContacts.h b/plugins/RecentContacts/RecentContacts.h
index 76adb2fdd8..6b5731fa7d 100644
--- a/plugins/RecentContacts/RecentContacts.h
+++ b/plugins/RecentContacts/RecentContacts.h
@@ -21,7 +21,6 @@
 #include <m_system_cpp.h>

 #include <m_message.h>

 #include <m_utils.h>

-#include <m_updater.h>

 #include <m_icolib.h>

 #include <m_hotkeys.h>

 #include <m_protosvc.h>

diff --git a/plugins/SecureIM/commonheaders.h b/plugins/SecureIM/commonheaders.h
index c654b9e2b6..a9f3e62508 100644
--- a/plugins/SecureIM/commonheaders.h
+++ b/plugins/SecureIM/commonheaders.h
@@ -94,7 +94,6 @@
 #include "m_message.h"

 #include "m_netlib.h"

 #include "m_metacontacts.h"

-#include "m_updater.h"

 #include "m_extraicons.h"

 #include "m_folders.h"

  

diff --git a/plugins/Sessions/Src/Sessions.h b/plugins/Sessions/Src/Sessions.h
index a1c71f970d..18c2878938 100644
--- a/plugins/Sessions/Src/Sessions.h
+++ b/plugins/Sessions/Src/Sessions.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "m_hotkeys.h"

 #include "win2k.h"

 

-#include "m_updater.h"

 #include "m_toptoolbar.h"

 #include "m_sessions.h"

 

diff --git a/plugins/SimpleStatusMsg/commonheaders.h b/plugins/SimpleStatusMsg/commonheaders.h
index 13ddbceef8..594fbfa546 100644
--- a/plugins/SimpleStatusMsg/commonheaders.h
+++ b/plugins/SimpleStatusMsg/commonheaders.h
@@ -56,7 +56,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "m_fortunemsg.h"

 #include "m_statusplugins.h"

 #include "m_toptoolbar.h"

-#include "m_updater.h"

 #include "m_variables.h"

 #include "m_simpleaway.h"

 #include "m_simplestatusmsg.h"

diff --git a/plugins/SmileyAdd/main.cpp b/plugins/SmileyAdd/main.cpp
index 55e4542490..510bdaba3c 100644
--- a/plugins/SmileyAdd/main.cpp
+++ b/plugins/SmileyAdd/main.cpp
@@ -24,7 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "download.h"

 #include "imagecache.h"

 #include "version.h"

-#include "m_updater.h"

 #include "m_metacontacts.h"

 

 //globals

diff --git a/plugins/SpellChecker/commons.h b/plugins/SpellChecker/commons.h
index 7243704560..c03fc3d7cd 100644
--- a/plugins/SpellChecker/commons.h
+++ b/plugins/SpellChecker/commons.h
@@ -63,7 +63,6 @@ using namespace std;
 

 //own includes

 #include "m_folders.h"

-#include "m_updater.h"

 #include "m_metacontacts.h"

 #include "m_variables.h"

 #include "m_userinfoex.h"

diff --git a/plugins/SplashScreen/src/headers.h b/plugins/SplashScreen/src/headers.h
index d94b597fd5..5c0a4f0713 100644
--- a/plugins/SplashScreen/src/headers.h
+++ b/plugins/SplashScreen/src/headers.h
@@ -48,7 +48,6 @@
 #include <m_langpack.h>

 #include <m_system.h>

 #include <m_png.h>

-#include "m_updater.h"

 #include "m_splash.h"

 

 // Common headers

diff --git a/plugins/StatusPlugins/commonstatus.h b/plugins/StatusPlugins/commonstatus.h
index 797fd6ed4b..422a7821bc 100644
--- a/plugins/StatusPlugins/commonstatus.h
+++ b/plugins/StatusPlugins/commonstatus.h
@@ -47,7 +47,6 @@
 #include "m_statusplugins.h"

 #include <m_utils.h>

 #include <m_NewAwaySys.h>

-#include <m_updater.h>

 #include <win2k.h>

 

 #if defined( _WIN64 )

diff --git a/plugins/Svc_dbepp/headers.h b/plugins/Svc_dbepp/headers.h
index e90738306b..0815c16c10 100644
--- a/plugins/Svc_dbepp/headers.h
+++ b/plugins/Svc_dbepp/headers.h
@@ -41,7 +41,6 @@
 #include <m_icolib.h>

 #include <m_hotkeys.h>

 

-#include "m_updater.h"

 #include "m_toptoolbar.h"

 

 #include "resource.h"

diff --git a/plugins/Svc_vi/common.h b/plugins/Svc_vi/common.h
index c87ff4c726..3182abc660 100644
--- a/plugins/Svc_vi/common.h
+++ b/plugins/Svc_vi/common.h
@@ -60,7 +60,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_popup.h"

 

 #include "m_utils.h"

-#include "m_updater.h"

 #include "m_folders.h"

 #include "win2k.h"

 

diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index 7dff93ad70..b61d452edd 100644
--- a/plugins/TabSRMM/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
@@ -222,7 +222,6 @@
 #include "m_spellchecker.h"

 #include "m_mathmodule.h"

 #include "m_historyevents.h"

-#include "m_updater.h"

 #include "m_smileyadd.h"

 

 #include "../include/m_cln_skinedit.h"

diff --git a/plugins/TipperYM/common.h b/plugins/TipperYM/common.h
index 01f2393487..ab678bac79 100644
--- a/plugins/TipperYM/common.h
+++ b/plugins/TipperYM/common.h
@@ -83,7 +83,6 @@ Boston, MA 02111-1307, USA.
 #include "m_folders.h"

 #include "m_metacontacts.h"

 #include "m_variables.h"

-#include "m_updater.h"

 #include "m_smileyadd.h"

 

 // {8392DF1D-9090-4f8e-9DF6-2FE058EDD800}

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index 969d714b8b..c6c0b45e79 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -304,7 +304,7 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = m_hDllInstance;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.pszTitle = LPGEN("Tooltip Notify");

-	odp.pszGroup = LPGEN("Appearance");

+	odp.pszGroup = LPGEN("Customize");

 	odp.groupPosition = 910000000;

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = CTooltipNotify::OptionsDlgProcWrapper;

diff --git a/plugins/UserInfoEx/init.cpp b/plugins/UserInfoEx/init.cpp
index afcac8fc6e..0705c153fd 100644
--- a/plugins/UserInfoEx/init.cpp
+++ b/plugins/UserInfoEx/init.cpp
@@ -29,7 +29,6 @@ Last change by : $Author: ing.u.horn $
 */

 #include "commonheaders.h"

 #include "res/version.h"

-#include "m_updater.h"

 

 #include "mir_menuitems.h"

 #include "ctrl_base.h"

diff --git a/plugins/WhenWasIt/commonheaders.h b/plugins/WhenWasIt/commonheaders.h
index 2b1a3550cb..a231fafba8 100644
--- a/plugins/WhenWasIt/commonheaders.h
+++ b/plugins/WhenWasIt/commonheaders.h
@@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_toptoolbar.h"

 #include "m_metacontacts.h"

 #include "m_message.h"

-#include "m_updater.h"

 #include "m_extraicons.h"

 

 extern char ModuleName[];

diff --git a/plugins/YAPP/common.h b/plugins/YAPP/common.h
index 9625c55bb3..1b2a52b74b 100644
--- a/plugins/YAPP/common.h
+++ b/plugins/YAPP/common.h
@@ -53,8 +53,6 @@
 #include <m_popup.h>

 #include <win2k.h>

 

-#include "m_updater.h"

-

 #include <m_notify.h>

 

 #define MODULE			"YAPP"