we better start threads inside OnModulesLoaded, so we don't have to kill them

2 files changed, 3 insertions, 4 deletions

diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp
index 2a0c5de4f0..6c5bf322e7 100644
--- a/protocols/JabberG/src/jabber_iq.cpp
+++ b/protocols/JabberG/src/jabber_iq.cpp
@@ -140,8 +140,6 @@ void __cdecl CJabberProto::ExpirerThread(void* pParam)
 

 void CJabberIqManager::ExpirerThread()

 {

-	Thread_SetName("Jabber: ExpirerThread");

-

 	while (!m_bExpirerThreadShutdownRequest) {

 		CJabberIqInfo *pInfo = DetachExpired();

 		if (!pInfo) {

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 5957cfd772..6a125f7ffc 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -188,7 +188,6 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
 	HookProtoEvent(ME_SKIN2_ICONSCHANGED, &CJabberProto::OnReloadIcons);

 

 	m_iqManager.FillPermanentHandlers();

-	m_iqManager.Start();

 	m_messageManager.FillPermanentHandlers();

 	m_adhocManager.FillDefaultNodes();

 	

@@ -198,7 +197,6 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) :
 	InitPopups();

 	GlobalMenuInit();

 	WsInit();

-	ConsoleInit();

 

 	m_pepServices.insert(new CPepMood(this));

 	m_pepServices.insert(new CPepActivity(this));

@@ -273,6 +271,9 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM)
 	XStatusInit();

 	m_pepServices.InitGui();

 

+	m_iqManager.Start();

+

+	ConsoleInit();

 	InitInfoFrame();

 

 	GCREGISTER gcr = {};