StdChat merged with core

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

1 files changed, 39 insertions, 35 deletions

diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index b1d7cbafcb..a6b6d2d9e3 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "commonheaders.h"

 

 #include "../modules/plugins/plugins.h"

+#include "../modules/chat/chat.h"

 

 int CheckRestart();		// core: IDD_WAITRESTART

 

@@ -88,19 +89,19 @@ int LoadDescButtonModule();
 int LoadDefaultModules(void)

 {

 	//load order is very important for these

-	if ( LoadSystemModule()) return 1;

-	if ( LoadLangpackModule()) return 1;		// langpack will be a system module in the new order so this is moved here

-	if ( CheckRestart()) return 1;

-	if ( LoadUtilsModule()) return 1;		//order not important for this, but no dependencies and no point in pluginising

-	if ( LoadIcoTabsModule()) return 1;

-	if ( LoadHeaderbarModule()) return 1;

-	if ( LoadDbintfModule()) return 1;

-	if ( LoadEventsModule()) return 1;

+	if (LoadSystemModule()) return 1;

+	if (LoadLangpackModule()) return 1;		// langpack will be a system module in the new order so this is moved here

+	if (CheckRestart()) return 1;

+	if (LoadUtilsModule()) return 1;		//order not important for this, but no dependencies and no point in pluginising

+	if (LoadIcoTabsModule()) return 1;

+	if (LoadHeaderbarModule()) return 1;

+	if (LoadDbintfModule()) return 1;

+	if (LoadEventsModule()) return 1;

 

 	// load database drivers & service plugins without executing their Load()

-	if ( LoadNewPluginsModuleInfos()) return 1;

+	if (LoadNewPluginsModuleInfos()) return 1;

 

-	switch ( LoadDefaultServiceModePlugin()) {

+	switch (LoadDefaultServiceModePlugin()) {

 	case SERVICE_CONTINUE:  // continue loading Miranda normally

 	case SERVICE_ONLYDB:    // load database and go to the message cycle

 		break;

@@ -111,12 +112,12 @@ int LoadDefaultModules(void)
 	}

 

 	// the database will select which db plugin to use, or fail if no profile is selected

-	if ( LoadDatabaseModule()) return 1;

+	if (LoadDatabaseModule()) return 1;

 

 	// database is available here

-	if ( LoadButtonModule()) return 1;

-	if ( LoadIcoLibModule()) return 1;

-	if ( LoadSkinIcons()) return 1;

+	if (LoadButtonModule()) return 1;

+	if (LoadIcoLibModule()) return 1;

+	if (LoadSkinIcons()) return 1;

 

 //	if ( LoadErrorsModule()) return 1;

 

@@ -132,37 +133,40 @@ int LoadDefaultModules(void)
 		return 1;

 	}

 

-	if ( LoadSkinSounds()) return 1;

-	if ( LoadSkinHotkeys()) return 1;

-	if ( LoadFontserviceModule()) return 1;

-	if ( LoadSrmmModule()) return 1;

-

-	if ( LoadDescButtonModule()) return 1;

-	if ( LoadOptionsModule()) return 1;

-	if ( LoadNetlibModule()) return 1;

-	if ( LoadSslModule()) return 1;

-	     NetlibInitSsl();

-	if ( LoadProtocolsModule()) return 1;

-	     LoadDbAccounts();                    // retrieves the account array from a database

-	if ( LoadContactsModule()) return 1;

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

-	if ( LoadAddContactModule()) return 1;

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

+	if (LoadSkinSounds()) return 1;

+	if (LoadSkinHotkeys()) return 1;

+	if (LoadFontserviceModule()) return 1;

+	if (LoadSrmmModule()) return 1;

+	InitChatModule();

+

+	if (LoadDescButtonModule()) return 1;

+	if (LoadOptionsModule()) return 1;

+	if (LoadNetlibModule()) return 1;

+	if (LoadSslModule()) return 1;

+	NetlibInitSsl();

+	if (LoadProtocolsModule()) return 1;

+	LoadDbAccounts();                    // retrieves the account array from a database

+	if (LoadContactsModule()) return 1;

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

+	// LoadChatModule();

+	if (LoadAddContactModule()) return 1;

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

 

 	Langpack_SortDuplicates();

 

-	if ( LoadAccountsModule()) return 1;

+	if (LoadAccountsModule()) return 1;

 

 	//order becomes less important below here

-	if ( LoadFindAddModule()) return 1;

-	if ( LoadIgnoreModule()) return 1;

-	if ( LoadVisibilityModule()) return 1;

-	if ( LoadStdPlugins()) return 1;

+	if (LoadFindAddModule()) return 1;

+	if (LoadIgnoreModule()) return 1;

+	if (LoadVisibilityModule()) return 1;

+	if (LoadStdPlugins()) return 1;

 	return 0;

 }

 

 void UnloadDefaultModules(void)

 {

+	UnloadChatModule();

 	UnloadAccountsModule();

 	UnloadNewPlugins();

 	UnloadProtocolsModule();