From b638838fd6ec1eb32d096e0244e8e0d2a8196c73 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 17 Jan 2014 14:41:49 +0000
Subject: - kernel chat module loads automatically, not on request; - the
 special structure, CHAT_MANAGER_INITDATA, is used to customize chats; - fix
 for fonts group for all plugins; - fix for options in tabSRMM

git-svn-id: http://svn.miranda-ng.org/main/trunk@7688 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/modules.cpp          | 4 +---
 src/core/stdchat/src/main.cpp | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index a6b6d2d9e3..5a991a6d39 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -137,8 +137,7 @@ int LoadDefaultModules(void)
 	if (LoadSkinHotkeys()) return 1;
 	if (LoadFontserviceModule()) return 1;
 	if (LoadSrmmModule()) return 1;
-	InitChatModule();
-
+	if (LoadChatModule()) return 1;
 	if (LoadDescButtonModule()) return 1;
 	if (LoadOptionsModule()) return 1;
 	if (LoadNetlibModule()) return 1;
@@ -148,7 +147,6 @@ int LoadDefaultModules(void)
 	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
 
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index 18e16c34cd..95fd00ef68 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -262,9 +262,8 @@ extern "C" __declspec(dllexport) int Load(void)
 	mir_getLP(&pluginInfo);
 	mir_getCLI();
 	
-	mir_getCI(&g_Settings);
-	pci->cbModuleInfo = sizeof(MODULEINFO);
-	pci->cbSession = sizeof(SESSION_INFO);
+	CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Chat module") };
+	mir_getCI(&data);
 	pci->OnAddUser = OnAddUser;
 	pci->OnNewUser = OnNewUser;
 	pci->OnRemoveUser = OnRemoveUser;
-- 
cgit v1.2.3