preparing to load mc module

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

2 files changed, 9 insertions, 11 deletions

diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index 75199b1c82..b38bf3bad6 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -45,6 +45,7 @@ int LoadSrmmModule(void);
 int LoadContactsModule(void);

 int LoadContactListModule(void);// ui: clist

 int LoadDatabaseModule(void);

+int LoadMetacontacts(void);

 int LoadOptionsModule(void);	// ui: options dialog

 int LoadFindAddModule(void);	// ui: search/add users

 int LoadSkinIcons(void);

@@ -52,6 +53,7 @@ int LoadSkinSounds(void);
 int LoadSkinHotkeys(void);

 int LoadUserInfoModule(void);	// ui: user info

 int LoadVisibilityModule(void);	// ui: visibility control

+

 int LoadPluginOptionsModule(void);	// ui: plugin viewer

 int LoadAddContactModule(void);	// ui: authcontrol contacts

 int LoadUtilsModule(void);		// ui: utils (has a few window classes, like HyperLink)

@@ -72,6 +74,7 @@ void UnloadErrorsModule(void);
 void UnloadEventsModule(void);

 void UnloadExtraIconsModule(void);

 void UnloadIcoLibModule(void);

+void UnloadMetacontacts(void);

 void UnloadNetlibModule(void);

 void UnloadNewPlugins(void);

 void UnloadProtocolsModule(void);

@@ -147,6 +150,7 @@ int LoadDefaultModules(void)
 	if (LoadContactsModule()) return 1;

 	if (LoadContactListModule()) return 1;   // prepare contact list interface

 	if (LoadAddContactModule()) return 1;

+	// if (LoadMetacontacts()) return 1;

 	if (LoadNewPluginsModule()) return 1;    // will call Load(void) on everything, clist will load first

 

 	Langpack_SortDuplicates();

@@ -165,12 +169,13 @@ void UnloadDefaultModules(void)
 {

 	UnloadChatModule();

 	UnloadAccountsModule();

+	// UnloadMetacontacts();

 	UnloadNewPlugins();

 	UnloadProtocolsModule();

 	UnloadSkinSounds();

 	UnloadSkinHotkeys();

 	UnloadSrmmModule();

-//	UnloadErrorsModule();

+	//	UnloadErrorsModule();

 	UnloadIcoLibModule();

 	UnloadUtilsModule();

 	UnloadExtraIconsModule();

diff --git a/src/modules/metacontacts/meta_main.cpp b/src/modules/metacontacts/meta_main.cpp
index 6c202feac5..e8fc8f1366 100644
--- a/src/modules/metacontacts/meta_main.cpp
+++ b/src/modules/metacontacts/meta_main.cpp
@@ -49,19 +49,13 @@ HICON LoadIconEx(IconIndex i)
 	return Skin_GetIcon(iconList[i].szName);

 }

 

-/** Prepare the plugin to stop

-* Called by Miranda when it will exit or when the plugin gets deselected

-*/

-int UnloadMetacontacts(void)

+void UnloadMetacontacts(void)

 {

-	// see also meta_services.c, Meta_PreShutdown

 	Meta_CloseHandles();

-	return 0;

 }

  

-/** Initializes the services provided and the link to those needed

-* Called when the plugin is loaded into Miranda

-*/

+// Initializes the services provided and the link to those needed

+// Called when the plugin is loaded into Miranda

 int LoadMetacontacts(void)

 {

 	Icon_Register(hInst, META_PROTO, iconList, SIZEOF(iconList), "mc");

@@ -98,7 +92,6 @@ int LoadMetacontacts(void)
 			MessageBox(0, TranslateT("Error - Database corruption.\nPlugin disabled."), TranslateT("MetaContacts"), MB_OK | MB_ICONERROR);

 			db_set_b(0, META_PROTO, "DisabledMessageShown", 1);

 		}

-		//Meta_HideMetaContacts(TRUE);

 		return 1;

 	}